about summary refs log tree commit diff
path: root/pkgs/tools/X11
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2022-10-15 06:07:54 +0000
committerGitHub <noreply@github.com>2022-10-15 06:07:54 +0000
commit4f07e7f326780b00020e1cfd57e216d10e5526e4 (patch)
treee31d650939268c2a2a3bd9d8af292dbcdc82b305 /pkgs/tools/X11
parent886633ba433d947a05ff2275ccf019b1e820debe (diff)
parent5b04d5b51b2695e7bcd05d5dcb8ce5eda0d0150c (diff)
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/X11')
-rw-r--r--pkgs/tools/X11/sx/default.nix9
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/tools/X11/sx/default.nix b/pkgs/tools/X11/sx/default.nix
index 1b04bb8876d33..faddc74868092 100644
--- a/pkgs/tools/X11/sx/default.nix
+++ b/pkgs/tools/X11/sx/default.nix
@@ -3,8 +3,7 @@
 , coreutils
 , fetchFromGitHub
 , resholve
-, xauth
-, xorgserver
+, xorg
 }:
 
 resholve.mkDerivation rec {
@@ -26,11 +25,11 @@ resholve.mkDerivation rec {
       interpreter = "${bash}/bin/sh";
       inputs = [
         coreutils
-        xauth
-        xorgserver
+        xorg.xauth
+        xorg.xorgserver
       ];
       execer = [
-        "cannot:${xorgserver}/bin/Xorg"
+        "cannot:${xorg.xorgserver}/bin/Xorg"
       ];
     };
   };