From 93db879a757dd6d90e8bcb396f15ec3baa13ad4e Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Sun, 1 Jun 2025 10:49:52 +0300
Subject: [PATCH 1/4] spectrwm: use top-level X11 libs instead of `xorg`
 namespace

---
 pkgs/by-name/sp/spectrwm/package.nix | 31 +++++++++++++++-------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/sp/spectrwm/package.nix b/pkgs/by-name/sp/spectrwm/package.nix
index 09c5b19b7ced..0d10ca3db84a 100644
--- a/pkgs/by-name/sp/spectrwm/package.nix
+++ b/pkgs/by-name/sp/spectrwm/package.nix
@@ -4,7 +4,13 @@
   fetchFromGitHub,
   libbsd,
   pkg-config,
-  xorg,
+  libXrandr,
+  libXcursor,
+  libXft,
+  libXt,
+  xcbutil,
+  xcbutilkeysyms,
+  xcbutilwm,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -19,19 +25,16 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = (
-    with xorg;
-    [
-      libXrandr
-      libXcursor
-      libXft
-      libXt
-      xcbutil
-      xcbutilkeysyms
-      xcbutilwm
-    ]
-    ++ [ libbsd ]
-  );
+  buildInputs = [
+    libXrandr
+    libXcursor
+    libXft
+    libXt
+    xcbutil
+    xcbutilkeysyms
+    xcbutilwm
+    libbsd
+  ];
 
   prePatch =
     let

From 8191b310b506935e61a1bf60ca01acafb4f45f51 Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Sun, 1 Jun 2025 10:53:52 +0300
Subject: [PATCH 2/4] spectrwm: replace `rev` with `tag`

---
 pkgs/by-name/sp/spectrwm/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/sp/spectrwm/package.nix b/pkgs/by-name/sp/spectrwm/package.nix
index 0d10ca3db84a..4ee09f1b713c 100644
--- a/pkgs/by-name/sp/spectrwm/package.nix
+++ b/pkgs/by-name/sp/spectrwm/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "conformal";
     repo = "spectrwm";
-    rev = "SPECTRWM_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}";
+    tag = "SPECTRWM_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}";
     hash = "sha256-Dnn/iIrceiAVuMR8iMGcc7LqNhWC496eT5gNrYOInRU=";
   };
 

From 483cf0f894791e4eca589fabba9b265955a327de Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Sun, 1 Jun 2025 10:54:20 +0300
Subject: [PATCH 3/4] spectrwm: remove `with lib`

---
 pkgs/by-name/sp/spectrwm/package.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/sp/spectrwm/package.nix b/pkgs/by-name/sp/spectrwm/package.nix
index 4ee09f1b713c..2c3754216d4b 100644
--- a/pkgs/by-name/sp/spectrwm/package.nix
+++ b/pkgs/by-name/sp/spectrwm/package.nix
@@ -44,12 +44,14 @@ stdenv.mkDerivation (finalAttrs: {
 
   makeFlags = [ "PREFIX=${placeholder "out"}" ];
 
-  meta = with lib; {
+  meta = {
     description = "Tiling window manager";
     homepage = "https://github.com/conformal/spectrwm";
-    maintainers = with maintainers; [ rake5k ];
-    license = licenses.isc;
-    platforms = platforms.all;
+    maintainers = with lib.maintainers; [
+      rake5k
+    ];
+    license = lib.licenses.isc;
+    platforms = lib.platforms.all;
 
     longDescription = ''
       spectrwm is a small dynamic tiling window manager for X11. It

From 3900ae5556cd7dd4e9bf6f864847b7fa1208093b Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Sun, 1 Jun 2025 12:58:34 +0300
Subject: [PATCH 4/4] spectrwm: use `sourceRoot`

---
 pkgs/by-name/sp/spectrwm/package.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/by-name/sp/spectrwm/package.nix b/pkgs/by-name/sp/spectrwm/package.nix
index 2c3754216d4b..88129f8bb349 100644
--- a/pkgs/by-name/sp/spectrwm/package.nix
+++ b/pkgs/by-name/sp/spectrwm/package.nix
@@ -36,11 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
     libbsd
   ];
 
-  prePatch =
-    let
-      subdir = if stdenv.hostPlatform.isDarwin then "osx" else "linux";
-    in
-    "cd ${subdir}";
+  sourceRoot = finalAttrs.src.name + (if stdenv.hostPlatform.isDarwin then "/osx" else "/linux");
 
   makeFlags = [ "PREFIX=${placeholder "out"}" ];