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/X11/xpra | |
| parent | bff9b546e4722923e86afc99ccacace31f70ee77 (diff) | |
| download | nixlib-db81e221487e8f97018b15c20270044c24c6e918.tar nixlib-db81e221487e8f97018b15c20270044c24c6e918.tar.gz nixlib-db81e221487e8f97018b15c20270044c24c6e918.tar.bz2 nixlib-db81e221487e8f97018b15c20270044c24c6e918.tar.lz nixlib-db81e221487e8f97018b15c20270044c24c6e918.tar.xz nixlib-db81e221487e8f97018b15c20270044c24c6e918.tar.zst nixlib-db81e221487e8f97018b15c20270044c24c6e918.zip | |
treewide: Mass-replace 'xorgserver}/bin' with correct output
vcunat added one fix in xdummy.
Diffstat (limited to 'pkgs/tools/X11/xpra')
| -rw-r--r-- | pkgs/tools/X11/xpra/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/X11/xpra/gtk3.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 5ef80e887cf6..fe95b2b685e7 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -53,14 +53,14 @@ buildPythonPackage rec { --set XKB_BINDIR "${xkbcomp}/bin" \ --set FONTCONFIG_FILE "${fontsConf}" \ --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib \ - --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 ''; #TODO: replace postInstall with postFixup to avoid double wrapping of xpra; needs more work though #postFixup = '' # sed -i '2iexport XKB_BINDIR="${xkbcomp}/bin"' $out/bin/xpra # sed -i '3iexport FONTCONFIG_FILE="${fontsConf}"' $out/bin/xpra - # sed -i '4iexport PATH=${getopt}/bin:${xorgserver}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin\${PATH:+:}\$PATH' $out/bin/xpra + # sed -i '4iexport PATH=${getopt}/bin:${xorgserver.out}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin\${PATH:+:}\$PATH' $out/bin/xpra #''; diff --git a/pkgs/tools/X11/xpra/gtk3.nix b/pkgs/tools/X11/xpra/gtk3.nix index 04bcd1195147..de65897130a8 100644 --- a/pkgs/tools/X11/xpra/gtk3.nix +++ b/pkgs/tools/X11/xpra/gtk3.nix @@ -54,14 +54,14 @@ buildPythonPackage rec { --set XKB_BINDIR "${xkbcomp}/bin" \ --set FONTCONFIG_FILE "${fontsConf}" \ --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib \ - --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 ''; #TODO: replace postInstall with postFixup to avoid double wrapping of xpra; needs more work though #postFixup = '' # sed -i '2iexport XKB_BINDIR="${xkbcomp}/bin"' $out/bin/xpra # sed -i '3iexport FONTCONFIG_FILE="${fontsConf}"' $out/bin/xpra - # sed -i '4iexport PATH=${getopt}/bin:${xorgserver}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin\${PATH:+:}\$PATH' $out/bin/xpra + # sed -i '4iexport PATH=${getopt}/bin:${xorgserver.out}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin\${PATH:+:}\$PATH' $out/bin/xpra #''; |