From 08bf830a2d0402ccd351c24188aaeca4864997fb Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Mon, 26 Dec 2022 09:33:31 -0300
Subject: [PATCH 1/2] xpointerbarrier: 18.06 -> 20.07

---
 pkgs/tools/X11/xpointerbarrier/default.nix | 42 +++++++++++++++-------
 1 file changed, 29 insertions(+), 13 deletions(-)

diff --git a/pkgs/tools/X11/xpointerbarrier/default.nix b/pkgs/tools/X11/xpointerbarrier/default.nix
index 8cb36cb9141d..88bf06f3d0bd 100644
--- a/pkgs/tools/X11/xpointerbarrier/default.nix
+++ b/pkgs/tools/X11/xpointerbarrier/default.nix
@@ -1,22 +1,38 @@
-{ lib, stdenv, xorg, fetchgit }:
-stdenv.mkDerivation rec {
+{ lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  libX11,
+  libXfixes,
+  libXrandr,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
   pname = "xpointerbarrier";
-  version = "18.06";
-  src = fetchgit {
-    url = "https://www.uninformativ.de/git/xpointerbarrier.git";
-    rev = "v${version}";
-    sha256 = "1k7i641x18qhjm0llsaqn2h2g9k31kgv6p8sildllmbvgxyrgvq7";
+  version = "20.07";
+
+  src = fetchurl {
+    url = "https://www.uninformativ.de/git/xpointerbarrier/archives/xpointerbarrier-v${finalAttrs.version}.tar.gz";
+    hash = "sha256-V1sNAQjsPVSjJ2nhCSdZqZQA78pjUE0z3IU4+I85CpI=";
   };
 
-  buildInputs = [ xorg.libX11 xorg.libXfixes xorg.libXrandr ];
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    libX11
+    libXfixes
+    libXrandr
+  ];
 
   makeFlags = [ "prefix=$(out)" ];
 
-  meta = {
+  meta = with lib; {
     homepage = "https://uninformativ.de/git/xpointerbarrier";
     description = "Create X11 pointer barriers around your working area";
-    license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.xzfc ];
-    platforms = lib.platforms.linux;
+    license = licenses.mit;
+    maintainers = with maintainers; [ AndersonTorres xzfc ];
+    platforms = platforms.linux;
   };
-}
+})

From af9d6e8b6e2e25b4b78eb082bd98064c08f2bfe3 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Mon, 26 Dec 2022 10:07:29 -0300
Subject: [PATCH 2/2] bevelbar: 16.11 -> 22.06

---
 .../window-managers/bevelbar/default.nix      | 25 ------------
 pkgs/tools/X11/bevelbar/default.nix           | 38 +++++++++++++++++++
 pkgs/tools/X11/xpointerbarrier/default.nix    |  2 +-
 pkgs/top-level/all-packages.nix               |  4 +-
 4 files changed, 41 insertions(+), 28 deletions(-)
 delete mode 100644 pkgs/applications/window-managers/bevelbar/default.nix
 create mode 100644 pkgs/tools/X11/bevelbar/default.nix

diff --git a/pkgs/applications/window-managers/bevelbar/default.nix b/pkgs/applications/window-managers/bevelbar/default.nix
deleted file mode 100644
index 74da42f88c94..000000000000
--- a/pkgs/applications/window-managers/bevelbar/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, libX11, libXrandr, libXft }:
-
-stdenv.mkDerivation rec {
-  pname = "bevelbar";
-  version = "16.11";
-
-  src = fetchFromGitHub {
-    owner = "vain";
-    repo = "bevelbar";
-    rev = "v${version}";
-    sha256 = "1hbwg3vdxw9fyshy85skv476p0zr4ynvhcz2xkijydpzm2j3rmjm";
-  };
-
-  buildInputs = [ libX11 libXrandr libXft ];
-
-  installFlags = [ "prefix=$(out)" ];
-
-  meta = with lib; {
-    description = "An X11 status bar with fancy schmancy 1985-ish beveled borders";
-    inherit (src.meta) homepage;
-    license = licenses.mit;
-    platforms = platforms.all;
-    maintainers = [ maintainers.neeasade ];
-  };
-}
diff --git a/pkgs/tools/X11/bevelbar/default.nix b/pkgs/tools/X11/bevelbar/default.nix
new file mode 100644
index 000000000000..7eab7a65e80a
--- /dev/null
+++ b/pkgs/tools/X11/bevelbar/default.nix
@@ -0,0 +1,38 @@
+{ lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  libX11,
+  libXft,
+  libXrandr,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "bevelbar";
+  version = "22.06";
+
+  src = fetchurl {
+    url = "https://www.uninformativ.de/git/bevelbar/archives/bevelbar-v${finalAttrs.version}.tar.gz";
+    hash = "sha256-8ceFwQFHhJ1qEXJtzoDXU0XRgudaAfsoWq7LYgGEqsM=";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    libX11
+    libXft
+    libXrandr
+  ];
+
+  makeFlags = [ "prefix=$(out)" ];
+
+  meta = with lib; {
+    homepage = "https://www.uninformativ.de/git/bevelbar/file/README.html";
+    description = "X11 status bar with beveled borders";
+    license = licenses.mit;
+    maintainers = with maintainers; [ AndersonTorres neeasade ];
+    platforms = platforms.linux;
+  };
+})
diff --git a/pkgs/tools/X11/xpointerbarrier/default.nix b/pkgs/tools/X11/xpointerbarrier/default.nix
index 88bf06f3d0bd..33271090678f 100644
--- a/pkgs/tools/X11/xpointerbarrier/default.nix
+++ b/pkgs/tools/X11/xpointerbarrier/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
   makeFlags = [ "prefix=$(out)" ];
 
   meta = with lib; {
-    homepage = "https://uninformativ.de/git/xpointerbarrier";
+    homepage = "https://www.uninformativ.de/git/xpointerbarrier/file/README.html";
     description = "Create X11 pointer barriers around your working area";
     license = licenses.mit;
     maintainers = with maintainers; [ AndersonTorres xzfc ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 271505dac835..a58c3386329e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5595,6 +5595,8 @@ with pkgs;
 
   bfs = callPackage ../tools/system/bfs { };
 
+  bevelbar = callPackage ../tools/X11/bevelbar { };
+
   bgs = callPackage ../tools/X11/bgs { };
 
   bibclean = callPackage ../tools/typesetting/bibclean { };
@@ -27828,8 +27830,6 @@ with pkgs;
     enableVST2 = true;
   };
 
-  bevelbar = callPackage ../applications/window-managers/bevelbar { };
-
   bfcal = libsForQt5.callPackage ../applications/misc/bfcal { };
 
   bibletime = libsForQt5.callPackage ../applications/misc/bibletime { };