diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-08-23 01:06:51 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-08-23 01:18:10 +0300 |
| commit | 74a3a2cd7e409062ad3efa61e84d366a8f67c853 (patch) | |
| tree | 3c12e08e51c0d1a2ec942ca02cb9cdbcc407b35d /pkgs/tools/X11 | |
| parent | c2553952195cb390c9ae65e2a31ad02cc82d0f76 (diff) | |
| download | nixlib-74a3a2cd7e409062ad3efa61e84d366a8f67c853.tar nixlib-74a3a2cd7e409062ad3efa61e84d366a8f67c853.tar.gz nixlib-74a3a2cd7e409062ad3efa61e84d366a8f67c853.tar.bz2 nixlib-74a3a2cd7e409062ad3efa61e84d366a8f67c853.tar.lz nixlib-74a3a2cd7e409062ad3efa61e84d366a8f67c853.tar.xz nixlib-74a3a2cd7e409062ad3efa61e84d366a8f67c853.tar.zst nixlib-74a3a2cd7e409062ad3efa61e84d366a8f67c853.zip | |
treewide: Use makeBinPath
Diffstat (limited to 'pkgs/tools/X11')
| -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 3a2c460160a7..1e5cc8465133 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -51,7 +51,7 @@ in buildPythonApplication rec { --set XPRA_LOG_DIR "\$HOME/.xpra" \ --set XPRA_INSTALL_PREFIX "$out" \ --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib \ - --prefix PATH : ${getopt}/bin:${xorgserver.out}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin + --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux ]} ''; preCheck = "exit 0"; @@ -60,7 +60,7 @@ in buildPythonApplication rec { #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.out}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin\${PATH:+:}\$PATH' $out/bin/xpra + # sed -i '4iexport PATH=${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux ]}\${PATH:+:}\$PATH' $out/bin/xpra #''; diff --git a/pkgs/tools/X11/xpra/gtk3.nix b/pkgs/tools/X11/xpra/gtk3.nix index f30c0751c3f2..aece94234a8c 100644 --- a/pkgs/tools/X11/xpra/gtk3.nix +++ b/pkgs/tools/X11/xpra/gtk3.nix @@ -54,7 +54,7 @@ buildPythonApplication rec { --set XKB_BINDIR "${xkbcomp}/bin" \ --set FONTCONFIG_FILE "${fontsConf}" \ --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib \ - --prefix PATH : ${getopt}/bin:${xorgserver.out}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin + --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux ]} ''; preCheck = "exit 0"; @@ -64,7 +64,7 @@ buildPythonApplication rec { #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.out}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin\${PATH:+:}\$PATH' $out/bin/xpra + # sed -i '4iexport PATH=${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux ]}\${PATH:+:}\$PATH' $out/bin/xpra #''; |