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 | |
parent | c2553952195cb390c9ae65e2a31ad02cc82d0f76 (diff) |
treewide: Use makeBinPath
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/X11/xpra/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/X11/xpra/gtk3.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/backup/btrbk/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/backup/duplicity/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/backup/store-backup/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/cd-dvd/unetbootin/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/graphics/pdfread/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/gparted/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/plowshare/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/profile-cleaner/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/networking/openvpn/openvpn_learnaddress.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/networking/snabb/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/security/prey/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/typesetting/djvu2pdf/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/typesetting/docbook2odf/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/typesetting/xmlto/default.nix | 2 |
16 files changed, 19 insertions, 19 deletions
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 3a2c460160a7a..1e5cc84651335 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 f30c0751c3f26..aece94234a8c6 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 #''; diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix index d4e058d143ffc..5faeb926c0638 100644 --- a/pkgs/tools/backup/btrbk/default.nix +++ b/pkgs/tools/backup/btrbk/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { wrapProgram $out/sbin/btrbk \ --set PERL5LIB $PERL5LIB \ - --prefix PATH ':' "${btrfs-progs}/bin:${bash}/bin/" + --prefix PATH ':' "${stdenv.lib.makeBinPath [ btrfs-progs bash ]}" ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index 27fc11946aad5..85b4a1e1a8f18 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -16,7 +16,7 @@ in stdenv.mkDerivation { python setup.py install --prefix=$out wrapProgram $out/bin/duplicity \ --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pycrypto}):$(toPythonPath ${ecdsa}):$(toPythonPath ${paramiko}):$(toPythonPath ${boto}):$(toPythonPath ${lockfile})" \ - --prefix PATH : "${gnupg}/bin:${ncftp}/bin" + --prefix PATH : "${stdenv.lib.makeBinPath [ gnupg ncftp ]}" wrapProgram $out/bin/rdiffdir \ --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pycrypto}):$(toPythonPath ${ecdsa}):$(toPythonPath ${paramiko}):$(toPythonPath ${boto}):$(toPythonPath ${lockfile})" ''; diff --git a/pkgs/tools/backup/store-backup/default.nix b/pkgs/tools/backup/store-backup/default.nix index 9329cd23e83f8..80ff97f097deb 100644 --- a/pkgs/tools/backup/store-backup/default.nix +++ b/pkgs/tools/backup/store-backup/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { for p in $out/bin/* do wrapProgram "$p" \ --prefix PERL5LIB ":" "${perlPackages.DBFile}/lib/perl5/site_perl" \ - --prefix PATH ":" "${which}/bin:${bzip2.bin}/bin" + --prefix PATH ":" "${stdenv.lib.makeBinPath [ which bzip2 ]}" done patchShebangs $out diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix index bf8cefd057ef9..7d4a341f555e4 100644 --- a/pkgs/tools/cd-dvd/unetbootin/default.nix +++ b/pkgs/tools/cd-dvd/unetbootin/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { cp unetbootin.desktop $out/share/applications wrapProgram $out/bin/unetbootin \ - --prefix PATH : ${which}/bin:${p7zip}/bin:${mtools}/bin + --prefix PATH : ${stdenv.lib.makeBinPath [ which p7zip mtools ]} ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/graphics/pdfread/default.nix b/pkgs/tools/graphics/pdfread/default.nix index a4184fd9514b3..3c43935e950d9 100644 --- a/pkgs/tools/graphics/pdfread/default.nix +++ b/pkgs/tools/graphics/pdfread/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { cp -R *.py pylrs $PYDIR wrapProgram $out/bin/pdfread.py --prefix PYTHONPATH : $PYTHONPATH:${pillow}/$LIBSUFFIX/PIL:$PYDIR \ - --prefix PATH : ${ghostscript}/bin:${pngnq}/bin:${djvulibre.bin}/bin:${unrar}/bin:${optipng}/bin + --prefix PATH : ${stdenv.lib.makeBinPath [ ghostscript pngnq djvulibre unrar optipng ]} ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index 3aa2c41546b86..d73def7ab9bba 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { wrapProgram $out/sbin/gparted \ --prefix PATH : "${procps}/bin" wrapProgram $out/sbin/gpartedbin \ - --prefix PATH : "${gpart}/bin:${hdparm}/bin:${utillinux}/bin" + --prefix PATH : "${stdenv.lib.makeBinPath [ gpart hdparm utillinux ]}" ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/plowshare/default.nix b/pkgs/tools/misc/plowshare/default.nix index 4ef8cbd757aea..d1b5481ad0176 100644 --- a/pkgs/tools/misc/plowshare/default.nix +++ b/pkgs/tools/misc/plowshare/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { make PREFIX="$out" install for fn in plow{del,down,list,up}; do - wrapProgram "$out/bin/$fn" --prefix PATH : "${curl.bin}/bin:${spidermonkey.out}/bin" + wrapProgram "$out/bin/$fn" --prefix PATH : "${stdenv.lib.makeBinPath [ curl spidermonkey ]}" done ''; diff --git a/pkgs/tools/misc/profile-cleaner/default.nix b/pkgs/tools/misc/profile-cleaner/default.nix index 2c1f3d77def3f..a55485953a813 100644 --- a/pkgs/tools/misc/profile-cleaner/default.nix +++ b/pkgs/tools/misc/profile-cleaner/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installPhase = '' PREFIX=\"\" DESTDIR=$out make install wrapProgram $out/bin/profile-cleaner \ - --prefix PATH : "${parallel}/bin:${sqlite.bin}/bin" + --prefix PATH : "${stdenv.lib.makeBinPath [ parallel sqlite ]}" ''; meta = { diff --git a/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix b/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix index 748f41c905384..706f2434a9552 100644 --- a/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix +++ b/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { install -Dm555 ovpn-learnaddress $out/libexec/openvpn/openvpn-learnaddress wrapProgram $out/libexec/openvpn/openvpn-learnaddress \ - --prefix PATH : ${coreutils}/bin:${gawk}/bin:${utillinux}/bin + --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gawk utillinux ]} ''; meta = { diff --git a/pkgs/tools/networking/snabb/default.nix b/pkgs/tools/networking/snabb/default.nix index f6b115805982b..3b405561ef934 100644 --- a/pkgs/tools/networking/snabb/default.nix +++ b/pkgs/tools/networking/snabb/default.nix @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { done # We need a way to pass $PATH to the scripts - sed -i '2iexport PATH=${git}/bin:${mariadb}/bin:${which}/bin:${procps}/bin:${coreutils}/bin' src/program/snabbnfv/neutron_sync_master/neutron_sync_master.sh.inc - sed -i '2iexport PATH=${git}/bin:${coreutils}/bin:${diffutils}/bin:${nettools}/bin' src/program/snabbnfv/neutron_sync_agent/neutron_sync_agent.sh.inc + sed -i '2iexport PATH=${stdenv.lib.makeBinPath [ git mariadb which procps coreutils ]}' src/program/snabbnfv/neutron_sync_master/neutron_sync_master.sh.inc + sed -i '2iexport PATH=${stdenv.lib.makeBinPath [ git coreutils diffutils nettools ]}' src/program/snabbnfv/neutron_sync_agent/neutron_sync_agent.sh.inc ''; installPhase = '' diff --git a/pkgs/tools/security/prey/default.nix b/pkgs/tools/security/prey/default.nix index 57352f99091af..ab041c8b05d67 100644 --- a/pkgs/tools/security/prey/default.nix +++ b/pkgs/tools/security/prey/default.nix @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { cp -R . $out cp -R ${modulesSrc}/* $out/modules/ wrapProgram "$out/prey.sh" \ - --prefix PATH ":" "${xawtv}/bin:${imagemagick.out}/bin:${curl.bin}/bin:${scrot}/bin:${inetutils}/bin:${coreutils}/bin" \ + --prefix PATH ":" "${stdenv.lib.makeBinPath [ xawtv imagemagick curl scrot inetutils coreutils ]}" \ --set CURL_CA_BUNDLE "/etc/ssl/certs/ca-certificates.crt" ''; diff --git a/pkgs/tools/typesetting/djvu2pdf/default.nix b/pkgs/tools/typesetting/djvu2pdf/default.nix index a426356a09f53..ce8a60dca869b 100644 --- a/pkgs/tools/typesetting/djvu2pdf/default.nix +++ b/pkgs/tools/typesetting/djvu2pdf/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin cp -p djvu2pdf $out/bin - wrapProgram $out/bin/djvu2pdf --prefix PATH : ${ghostscript}/bin:${djvulibre.bin}/bin:${which}/bin + wrapProgram $out/bin/djvu2pdf --prefix PATH : ${stdenv.lib.makeBinPath [ ghostscript djvulibre which ]} mkdir -p $out/man/man1 cp -p djvu2pdf.1.gz $out/man/man1 diff --git a/pkgs/tools/typesetting/docbook2odf/default.nix b/pkgs/tools/typesetting/docbook2odf/default.nix index 90b2ff61f3460..029227cd11864 100644 --- a/pkgs/tools/typesetting/docbook2odf/default.nix +++ b/pkgs/tools/typesetting/docbook2odf/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { sed -i "s|/usr/share/docbook2odf|$out/share/docbook2odf|" "$out/bin/docbook2odf" wrapProgram "$out/bin/docbook2odf" \ - --prefix PATH : "${zip}/bin:${libxslt}/bin" \ + --prefix PATH : "${stdenv.lib.makeBinPath [ zip libxslt ]}" \ --prefix PERL5PATH : "${stdenv.lib.makePerlPath [PerlMagick]}" ''; diff --git a/pkgs/tools/typesetting/xmlto/default.nix b/pkgs/tools/typesetting/xmlto/default.nix index 2ed846cb07030..ed3dad64f16d1 100644 --- a/pkgs/tools/typesetting/xmlto/default.nix +++ b/pkgs/tools/typesetting/xmlto/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram "$out/bin/xmlto" \ - --prefix PATH : "${libxslt.bin}/bin:${libxml2.bin}/bin:${getopt}/bin" + --prefix PATH : "${stdenv.lib.makeBinPath [ libxslt libxml2 getopt ]}" # `w3m' is needed for HTML to text conversions. substituteInPlace "$out/share/xmlto/format/docbook/txt" \ |