diff --git a/pkgs/by-name/sp/spectrwm/package.nix b/pkgs/by-name/sp/spectrwm/package.nix
index 09c5b19b7ced..88129f8bb349 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: {
@@ -14,39 +20,34 @@ 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=";
   };
 
   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
-      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"}" ];
 
-  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