about summary refs log tree commit diff
path: root/pkgs/tools/X11/sx
diff options
context:
space:
mode:
authorfigsoda <figsoda@pm.me>2022-11-27 12:12:38 -0500
committerfigsoda <figsoda@pm.me>2022-11-27 16:17:04 -0500
commit3e3f5eba2cd987822478b8e5db57fb759a85043e (patch)
tree75d404ed3980559087f584118163a6645c2a2537 /pkgs/tools/X11/sx
parent58ff418feca3b032b4c1744329887c57ee9b9036 (diff)
sx: use patsh instead of resholve
Diffstat (limited to 'pkgs/tools/X11/sx')
-rw-r--r--pkgs/tools/X11/sx/default.nix31
1 files changed, 13 insertions, 18 deletions
diff --git a/pkgs/tools/X11/sx/default.nix b/pkgs/tools/X11/sx/default.nix
index faddc74868092..f48e59c753eb2 100644
--- a/pkgs/tools/X11/sx/default.nix
+++ b/pkgs/tools/X11/sx/default.nix
@@ -1,12 +1,11 @@
 { lib
-, bash
-, coreutils
+, stdenvNoCC
 , fetchFromGitHub
-, resholve
+, patsh
 , xorg
 }:
 
-resholve.mkDerivation rec {
+stdenvNoCC.mkDerivation rec {
   pname = "sx";
   version = "2.1.7";
 
@@ -19,20 +18,16 @@ resholve.mkDerivation rec {
 
   makeFlags = [ "PREFIX=$(out)" ];
 
-  solutions = {
-    sx = {
-      scripts = [ "bin/sx" ];
-      interpreter = "${bash}/bin/sh";
-      inputs = [
-        coreutils
-        xorg.xauth
-        xorg.xorgserver
-      ];
-      execer = [
-        "cannot:${xorg.xorgserver}/bin/Xorg"
-      ];
-    };
-  };
+  nativeBuildInputs = [ patsh ];
+
+  buildInputs = [
+    xorg.xauth
+    xorg.xorgserver
+  ];
+
+  postInstall = ''
+    patsh -f $out/bin/sx -s ${builtins.storeDir}
+  '';
 
   meta = with lib; {
     description = "Simple alternative to both xinit and startx for starting a Xorg server";