diff options
| author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2015-10-18 01:53:13 +0300 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-28 10:17:12 +0100 |
| commit | db81e221487e8f97018b15c20270044c24c6e918 (patch) | |
| tree | 47b2a3fdc968f5bd5c8fa92437d3f6e07952dec3 /pkgs/tools/misc | |
| parent | bff9b546e4722923e86afc99ccacace31f70ee77 (diff) | |
| download | nixpkgs-db81e221487e8f97018b15c20270044c24c6e918.tar nixpkgs-db81e221487e8f97018b15c20270044c24c6e918.tar.gz nixpkgs-db81e221487e8f97018b15c20270044c24c6e918.tar.bz2 nixpkgs-db81e221487e8f97018b15c20270044c24c6e918.tar.lz nixpkgs-db81e221487e8f97018b15c20270044c24c6e918.tar.xz nixpkgs-db81e221487e8f97018b15c20270044c24c6e918.tar.zst nixpkgs-db81e221487e8f97018b15c20270044c24c6e918.zip | |
treewide: Mass-replace 'xorgserver}/bin' with correct output
vcunat added one fix in xdummy.
Diffstat (limited to 'pkgs/tools/misc')
| -rw-r--r-- | pkgs/tools/misc/xdummy/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/misc/xvfb-run/default.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/misc/xdummy/default.nix b/pkgs/tools/misc/xdummy/default.nix index 30aba19930c..1f4dbc86332 100644 --- a/pkgs/tools/misc/xdummy/default.nix +++ b/pkgs/tools/misc/xdummy/default.nix @@ -18,7 +18,7 @@ let EndSection Section "Files" - ModulePath "${xorg.xorgserver}/lib/xorg/modules" + ModulePath "${xorg.xorgserver.out}/lib/xorg/modules" ModulePath "${xorg.xf86videodummy}/lib/xorg/modules" XkbDir "${xkeyboard_config}/share/X11/xkb" FontPath "${xorg.fontadobe75dpi}/lib/X11/fonts/75dpi" @@ -75,7 +75,7 @@ let in writeScriptBin "xdummy" '' #!${stdenv.shell} export XKB_BINDIR="${xorg.xkbcomp}/bin" - exec ${xorg.xorgserver}/bin/Xorg \ + exec ${xorg.xorgserver.out}/bin/Xorg \ -noreset \ -logfile /dev/null \ "$@" \ diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix index 162fb73b3f0..f1cf0442434 100644 --- a/pkgs/tools/misc/xvfb-run/default.nix +++ b/pkgs/tools/misc/xvfb-run/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation { wrapProgram $out/bin/xvfb-run \ --set XKB_BINDIR "${xkbcomp}/bin" \ --set FONTCONFIG_FILE "${fontsConf}" \ - --prefix PATH : ${getopt}/bin:${xorgserver}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin + --prefix PATH : ${getopt}/bin:${xorgserver.out}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin ''; } |