JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

treewide: Use makeBinPath

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2016-08-23 01:06:51 +03:00
parent c255395219
commit 74a3a2cd7e
65 changed files with 71 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/misc/gitlab.nix
View File

@ -121,7 +121,7 @@ let
makeWrapper ${cfg.packages.gitlab.env}/bin/bundle $out/bin/gitlab-bundle \
${concatStrings (mapAttrsToList (name: value: "--set ${name} '${value}' ") gitlabEnv)} \
--set GITLAB_CONFIG_PATH '${cfg.statePath}/config' \
--set PATH '${pkgs.nodejs}/bin:${pkgs.gzip}/bin:${config.services.postgresql.package}/bin:$PATH' \
--set PATH '${stdenv.lib.makeBinPath [ pkgs.nodejs pkgs.gzip config.services.postgresql.package ]}:$PATH' \
--set RAKEOPT '-f ${cfg.packages.gitlab}/share/gitlab/Rakefile' \
--run 'cd ${cfg.packages.gitlab}/share/gitlab'
makeWrapper $out/bin/gitlab-bundle $out/bin/gitlab-rake \

2
nixos/modules/virtualisation/brightbox-image.nix
View File

@ -20,7 +20,7 @@ in
postVM =
''
PATH=$PATH:${pkgs.gnutar}/bin:${pkgs.gzip}/bin
PATH=$PATH:${stdenv.lib.makeBinPath [ pkgs.gnutar pkgs.gzip ]}
pushd $out
${pkgs.qemu_kvm}/bin/qemu-img convert -c -O qcow2 $diskImageBase nixos.qcow2
rm $diskImageBase

2
nixos/modules/virtualisation/google-compute-image.nix
View File

@ -23,7 +23,7 @@ in
postVM =
''
PATH=$PATH:${pkgs.gnutar}/bin:${pkgs.gzip}/bin
PATH=$PATH:${stdenv.lib.makeBinPath [ pkgs.gnutar pkgs.gzip ]}
pushd $out
mv $diskImageBase disk.raw
tar -Szcf $diskImageBase.tar.gz disk.raw

2
nixos/tests/virtualbox.nix
View File

@ -9,7 +9,7 @@ let
miniInit = ''
#!${pkgs.stdenv.shell} -xe
export PATH="${pkgs.coreutils}/bin:${pkgs.utillinux}/bin"
export PATH="${stdenv.lib.makeBinPath [ pkgs.coreutils pkgs.utillinux ]}"
mkdir -p /var/run/dbus
cat > /etc/passwd <<EOF

2
pkgs/applications/audio/caudec/default.nix
View File

@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
postFixup = ''
for executable in $(cd $out/bin && ls); do
wrapProgram $out/bin/$executable \
--prefix PATH : "${bc}/bin:${findutils}/bin:${sox}/bin:${procps}/bin:${opusTools}/bin:${lame}/bin:${flac.bin}/bin"
--prefix PATH : "${stdenv.lib.makeBinPath [ bc findutils sox procps opusTools lame flac ]}"
done
'';

2
pkgs/applications/editors/netbeans/default.nix
View File

@ -32,7 +32,7 @@ stdenv.mkDerivation {
mkdir -p $out/bin
cp -a netbeans $out
makeWrapper $out/netbeans/bin/netbeans $out/bin/netbeans \
--prefix PATH : ${jdk}/bin:${which}/bin \
--prefix PATH : ${stdenv.lib.makeBinPath [ jdk which ]} \
--prefix JAVA_HOME : ${jdk.home} \
--add-flags "--jdkhome ${jdk.home}"

2
pkgs/applications/graphics/geeqie/default.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
# Allow geeqie to find exiv2 and exiftran, necessary to
# losslessly rotate JPEG images.
sed -i $out/lib/geeqie/geeqie-rotate \
-e '1 a export PATH=${exiv2}/bin:${fbida}/bin:$PATH'
-e '1 a export PATH=${stdenv.lib.makeBinPath [ exiv2 fbida ]}:$PATH'
'';
meta = with stdenv.lib; {

4
pkgs/applications/graphics/processing/default.nix
View File

@ -21,10 +21,10 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin
cp -r linux/work/* $out/${name}/
makeWrapper $out/${name}/processing $out/bin/processing \
--prefix PATH : "${jdk}/bin:${which}/bin" \
--prefix PATH : "${stdenv.lib.makeBinPath [ jdk which ]}" \
--prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib
makeWrapper $out/${name}/processing-java $out/bin/processing-java \
--prefix PATH : "${jdk}/bin:${which}/bin" \
--prefix PATH : "${stdenv.lib.makeBinPath [ jdk which ]}" \
--prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib
ln -s ${jdk} $out/${name}/java
'';

2
pkgs/applications/misc/audio/wavesurfer/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation {
ln -s $out/{nix-support,bin}/wavesurfer.tcl
wrapProgram "$out/nix-support/wavesurfer.tcl" \
--set TCLLIBPATH "${snack}/lib" \
--prefix PATH : "${tcl}/bin:${tk}/bin"
--prefix PATH : "${stdenv.lib.makeBinPath [ tcl tk ]}"
'';
meta = {

2
pkgs/applications/misc/avrdudess/default.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
export LD_LIBRARY_PATH="${stdenv.lib.makeLibraryPath [gtk mono]}"
# We need PATH from user env for xdg-open to find its tools, which
# typically depend on the currently running desktop environment.
export PATH="${avrgcclibc}/bin:${avrdude}/bin:${xdg_utils}/bin:\$PATH"
export PATH="${stdenv.lib.makeBinPath [ avrgcclibc avrdude xdg_utils ]}:\$PATH"
# avrdudess must have its resource files in its current working directory
cd $out/avrdudess && exec ${mono}/bin/mono "$out/avrdudess/avrdudess.exe" "\$@"

2
pkgs/applications/misc/ding/default.nix
View File

@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
cp ding.png $out/share/pixmaps/
cp ding.desktop $out/share/applications/
wrapProgram $out/bin/ding --prefix PATH : ${gnugrep}/bin:${aspellEnv}/bin:${tk}/bin:${fortune}/bin --prefix ASPELL_CONF : "\"prefix ${aspellEnv};\""
wrapProgram $out/bin/ding --prefix PATH : ${stdenv.lib.makeBinPath [ gnugrep aspellEnv tk fortune ]} --prefix ASPELL_CONF : "\"prefix ${aspellEnv};\""
'';
meta = with stdenv.lib; {

2
pkgs/applications/misc/get_iplayer/default.nix
View File

@ -18,7 +18,7 @@ buildPerlPackage {
installPhase = ''
mkdir -p $out/bin $out/share/man/man1
cp get_iplayer $out/bin
wrapProgram $out/bin/get_iplayer --suffix PATH : ${ffmpeg.bin}/bin:${flvstreamer}/bin:${vlc}/bin:${rtmpdump}/bin --prefix PERL5LIB : $PERL5LIB
wrapProgram $out/bin/get_iplayer --suffix PATH : ${stdenv.lib.makeBinPath [ ffmpeg flvstreamer vlc rtmpdump ]} --prefix PERL5LIB : $PERL5LIB
cp get_iplayer.1 $out/share/man/man1
'';

2
pkgs/applications/networking/cluster/hadoop/default.nix
View File

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
mv * $out
for n in $out/{bin,sbin}"/"*; do
wrapProgram $n --prefix PATH : "${which}/bin:${jre}/bin:${bash}/bin" --set JAVA_HOME "${jre}" --set HADOOP_PREFIX "$out"
wrapProgram $n --prefix PATH : "${stdenv.lib.makeBinPath [ which jre bash ]}" --set JAVA_HOME "${jre}" --set HADOOP_PREFIX "$out"
done
'';

4
pkgs/applications/networking/cluster/kubernetes/default.nix
View File

@ -38,9 +38,9 @@ stdenv.mkDerivation rec {
preFixup = ''
wrapProgram "$out/bin/kube-proxy" --prefix PATH : "${iptables}/bin"
wrapProgram "$out/bin/kubelet" --prefix PATH : "${utillinux}/bin:${procps-ng}/bin"
wrapProgram "$out/bin/kubelet" --prefix PATH : "${stdenv.lib.makeBinPath [ utillinux procps-ng ]}"
chmod +x "$out/libexec/kubernetes/safe_format_and_mount"
wrapProgram "$out/libexec/kubernetes/safe_format_and_mount" --prefix PATH : "${e2fsprogs}/bin:${utillinux}/bin"
wrapProgram "$out/libexec/kubernetes/safe_format_and_mount" --prefix PATH : "${stdenv.lib.makeBinPath [ e2fsprogs utillinux ]}"
substituteInPlace "$out"/libexec/kubernetes/cluster/update-storage-objects.sh \
--replace KUBE_OUTPUT_HOSTBIN KUBE_BIN
'';

2
pkgs/applications/networking/cluster/pig/default.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
for n in $out/{bin,sbin}"/"*; do
wrapProgram $n \
--prefix PATH : "${jre}/bin:${bash}/bin" \
--prefix PATH : "${stdenv.lib.makeBinPath [ jre bash ]}" \
--set JAVA_HOME "${jre}" --set HADOOP_PREFIX "${hadoop}"
done
'';

2
pkgs/applications/networking/esniper/default.nix
View File

@ -16,7 +16,7 @@ stdenv.mkDerivation {
postInstall = ''
sed <"frontends/snipe" >"$out/bin/snipe" \
-e "2i export PATH=\"$out/bin:${coreutils}/bin:${gawk}/bin:${bash}/bin:${which}/bin:\$PATH\""
-e "2i export PATH=\"$out/bin:${stdenv.lib.makeBinPath [ coreutils gawk bash which ]}:\$PATH\""
chmod 555 "$out/bin/snipe"
'';

2
pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation {
'';
passthru = {
wrapArgs = "--prefix PATH ':' ${texLive}/bin:${imagemagick.out}/bin";
wrapArgs = "--prefix PATH ':' ${stdenv.lib.makeBinPath [ texLive imagemagick ]}";
};
meta = with stdenv.lib; {

2
pkgs/applications/networking/mailreaders/mailpile/default.nix
View File

@ -21,7 +21,7 @@ pythonPackages.buildPythonApplication rec {
postInstall = ''
wrapProgram $out/bin/mailpile \
--prefix PATH ":" "${gnupg1orig}/bin:${openssl.bin}/bin"
--prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg1orig openssl ]}"
'';
meta = with stdenv.lib; {

2
pkgs/applications/networking/seafile-client/default.nix
View File

@ -25,7 +25,7 @@ stdenv.mkDerivation rec
make install
wrapProgram $out/bin/seafile-applet \
--suffix PATH : ${ccnet}/bin:${seafile-shared}/bin
--suffix PATH : ${stdenv.lib.makeBinPath [ ccnet seafile-shared ]}
'';
meta =

2
pkgs/applications/office/gnucash/2.6.nix
View File

@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
--set GCONF_CONFIG_SOURCE 'xml::~/.gconf' \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share/gsettings-schemas/${name}" \
--prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" \
--prefix PATH ":" "$out/bin:${perl}/bin:${gconf}/bin"
--prefix PATH ":" "$out/bin:${stdenv.lib.makeBinPath [ perl gconf ]}"
done
rm $out/share/icons/hicolor/icon-theme.cache

2
pkgs/applications/office/gnucash/default.nix
View File

@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
--prefix LD_LIBRARY_PATH ":" "${libbonoboui}/lib/libglade/2.0" \
--prefix PERL5LIB ":" "$PERL5LIB" \
--set GCONF_CONFIG_SOURCE 'xml::~/.gconf' \
--prefix PATH ":" "$out/bin:${perl}/bin:${gconf}/bin"
--prefix PATH ":" "$out/bin:${stdenv.lib.makeBinPath [ perl gconf ]}"
done
rm $out/share/icons/hicolor/icon-theme.cache

2
pkgs/applications/video/mkcast/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
postInstall = ''
for f in $out/bin/*; do #*/
wrapProgram $f --prefix PATH : "${xdpyinfo}/bin:${wmctrl}/bin/:${byzanz}/bin/:${gnome3.gnome_terminal}/bin/:$out/bin"
wrapProgram $f --prefix PATH : "${stdenv.lib.makeBinPath [ xdpyinfo wmctrl byzanz gnome3.gnome_terminal ]}:$out/bin"
done
rm -r screenkey/.bzr

2
pkgs/applications/virtualization/docker/gc.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
cp docker-gc $out/bin
chmod +x $out/bin/docker-gc
wrapProgram $out/bin/docker-gc \
--prefix PATH : "${docker}/bin:${coreutils}/bin:${procps}/bin:${gnused}/bin:${findutils}/bin:${gnugrep}/bin"
--prefix PATH : "${stdenv.lib.makeBinPath [ docker coreutils procps gnused findutils gnugrep ]}"
'';
meta = {

2
pkgs/applications/window-managers/stumpwm/default.nix
View File

@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
cp $out/share/stumpwm/modules/util/stumpish/stumpish $out/bin/
chmod +x $out/bin/stumpish
wrapProgram $out/bin/stumpish \
--prefix PATH ":" "${rlwrap}/bin:${gnused}/bin:${gnugrep}/bin:${coreutils}/bin:${xprop}/bin"
--prefix PATH ":" "${stdenv.lib.makeBinPath [ rlwrap gnused gnugrep coreutils xprop ]}"
# Paths in the compressed image $out/bin/stumpwm are not
# recognized by Nix. Add explicit reference here.

2
pkgs/build-support/vm/default.nix
View File

@ -587,7 +587,7 @@ rec {
buildCommand = ''
${createRootFS}
PATH=$PATH:${dpkg}/bin:${dpkg}/bin:${glibc.bin}/bin:${lzma.bin}/bin
PATH=$PATH:${stdenv.lib.makeBinPath [ dpkg dpkg glibc lzma ]}
# Unpack the .debs. We do this to prevent pre-install scripts
# (which have lots of circular dependencies) from barfing.

2
pkgs/desktops/gnome-3/3.20/apps/gnome-boxes/default.nix
View File

@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
wrapProgram "$prog" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
--prefix PATH : "${mtools}/bin:${cdrkit}/bin:${libcdio}/bin:${qemu}/bin"
--prefix PATH : "${stdenv.lib.makeBinPath [ mtools cdrkit libcdio qemu ]}"
done
'';

2
pkgs/development/compilers/ghc/7.10.2.nix
View File

@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
for i in "$out/bin/"*; do
test ! -h $i || continue
egrep --quiet '^#!' <(head -n 1 $i) || continue
sed -i -e '2i export PATH="$PATH:${binutils}/bin:${coreutils}/bin"' $i
sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ binutils coreutils ]}"' $i
done
'';

2
pkgs/development/compilers/ghc/7.10.3.nix
View File

@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
for i in "$out/bin/"*; do
test ! -h $i || continue
egrep --quiet '^#!' <(head -n 1 $i) || continue
sed -i -e '2i export PATH="$PATH:${binutils}/bin:${coreutils}/bin"' $i
sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ binutils coreutils ]}"' $i
done
'';

2
pkgs/development/compilers/ghc/8.0.1.nix
View File

@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
for i in "$out/bin/"*; do
test ! -h $i || continue
egrep --quiet '^#!' <(head -n 1 $i) || continue
sed -i -e '2i export PATH="$PATH:${binutils}/bin:${coreutils}/bin"' $i
sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ binutils coreutils ]}"' $i
done
'';

2
pkgs/development/compilers/ghc/head.nix
View File

@ -61,7 +61,7 @@ in stdenv.mkDerivation rec {
for i in "$out/bin/"*; do
test ! -h $i || continue
egrep --quiet '^#!' <(head -n 1 $i) || continue
sed -i -e '2i export PATH="$PATH:${binutils}/bin:${coreutils}/bin"' $i
sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ binutils coreutils ]}"' $i
done
'';

2
pkgs/development/compilers/microscheme/default.nix
View File

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
make install PREFIX=$out
wrapProgram $out/bin/microscheme \
--prefix PATH : "${avrdude}/bin:${avrgcclibc}/bin"
--prefix PATH : "${stdenv.lib.makeBinPath [ avrdude avrgcclibc ]}"
'';
meta = with stdenv.lib; {

2
pkgs/development/compilers/squeak/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
postPatch = ''
for i in squeak.in squeak.sh.in; do
substituteInPlace unix/cmake/$i --replace "PATH=" \
"PATH=${coreutils}/bin:${gnused}/bin:${which}/bin #"
"PATH=${stdenv.lib.makeBinPath [ coreutils gnused which ]} #"
done
'';

2
pkgs/development/interpreters/elixir/default.nix
View File

@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
b=$(basename $f)
if [ $b == "mix" ]; then continue; fi
wrapProgram $f \
--prefix PATH ":" "${erlang}/bin:${coreutils}/bin:${curl.bin}/bin:${bash}/bin" \
--prefix PATH ":" "${stdenv.lib.makeBinPath [ erlang coreutils curl bash ]}" \
--set CURL_CA_BUNDLE /etc/ssl/certs/ca-certificates.crt
done

2
pkgs/development/interpreters/erlang/R16.nix
View File

@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
# Some erlang bin/ scripts run sed and awk
postFixup = ''
wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/"
wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${gnused}/bin/:${gawk}/bin"
wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnused gawk ]}"
'';
setupHook = ./setup-hook.sh;

2
pkgs/development/interpreters/erlang/R17.nix
View File

@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
# Some erlang bin/ scripts run sed and awk
postFixup = ''
wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/"
wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${gnused}/bin/:${gawk}/bin"
wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnused gawk ]}"
'';
setupHook = ./setup-hook.sh;

2
pkgs/development/interpreters/erlang/R18.nix
View File

@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
# Some erlang bin/ scripts run sed and awk
postFixup = ''
wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/"
wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${gnused}/bin/:${gawk}/bin"
wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnused gawk ]}"
'';
setupHook = ./setup-hook.sh;

2
pkgs/development/interpreters/erlang/R19.nix
View File

@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
# Some erlang bin/ scripts run sed and awk
postFixup = ''
wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/"
wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${gnused}/bin/:${gawk}/bin"
wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnused gawk ]}"
'';
setupHook = ./setup-hook.sh;

2
pkgs/development/interpreters/lfe/default.nix
View File

@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
# Add some stuff to PATH so the scripts can run without problems.
for f in $out/bin/*; do
wrapProgram $f \
--prefix PATH ":" "${erlang}/bin:${coreutils}/bin:${bash}/bin:$out/bin"
--prefix PATH ":" "${stdenv.lib.makeBinPath [ erlang coreutils bash ]}:$out/bin"
substituteInPlace $f --replace "/usr/bin/env" "${coreutils}/bin/env"
done
'';

2
pkgs/development/mobile/androidenv/androidsdk.nix
View File

@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
for i in emulator emulator64-arm emulator64-mips emulator64-x86 emulator64-crash-service
do
wrapProgram `pwd`/$i \
--prefix PATH : ${file}/bin:${glxinfo}/bin \
--prefix PATH : ${stdenv.lib.makeBinPath [ file glxinfo ]} \
--suffix LD_LIBRARY_PATH : `pwd`/lib64:`pwd`/lib64/qt/lib:${makeLibraryPath [ stdenv.cc.cc libX11 libxcb libXau libXdmcp libXext mesa alsaLib zlib libpulseaudio ]} \
--suffix QT_XKB_CONFIG_ROOT : ${xkeyboardconfig}/share/X11/xkb
done

2
pkgs/development/tools/build-managers/leiningen/builder.sh
View File

@ -18,6 +18,6 @@ chmod -v 755 $out_bin
patchShebangs $out
wrapProgram $out_bin \
--prefix PATH ":" "${rlwrap}/bin:${coreutils}/bin:${findutils}/bin" \
--prefix PATH ":" "${stdenv.lib.makeBinPath [ rlwrap coreutils findutils ]}" \
--set LEIN_GPG ${gnupg1compat}/bin/gpg \
--set JAVA_CMD ${jdk}/bin/java

2
pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
substituteInPlace $out/share/bootstrap.sh \
--replace "#!/bin/bash" "#!$(type -P bash)"
wrapProgram $out/bin/buildkite-agent \
--set PATH '"${openssh}/bin/:${git}/bin:${coreutils}/bin:${gnused}/bin:${gnugrep}/bin:$PATH"'
--set PATH '"${stdenv.lib.makeBinPath [ openssh git coreutils gnused gnugrep ]}:$PATH"'
'';
meta = {

2
pkgs/development/tools/continuous-integration/cide/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/bin
makeWrapper ${env}/bin/cide $out/bin/cide \
--set PATH ${docker}/bin:${git}/bin:${gnutar}/bin:${gzip}/bin
--set PATH ${stdenv.lib.makeBinPath [ docker git gnutar gzip ]}
'';
meta = with lib; {

2
pkgs/development/tools/haskell/ihaskell/wrapper.nix
View File

@ -9,7 +9,7 @@ let
ihaskellSh = writeScriptBin "ihaskell-notebook" ''
#! ${stdenv.shell}
export GHC_PACKAGE_PATH="$(echo ${ihaskellEnv}/lib/*/package.conf.d| tr ' ' ':'):$GHC_PACKAGE_PATH"
export PATH="${ihaskell}/bin:${ihaskellEnv}/bin:${ipython}/bin"
export PATH="${stdenv.lib.makeBinPath [ ihaskell ihaskellEnv ipython ]}"
${ihaskell}/bin/ihaskell install -l $(${ihaskellEnv}/bin/ghc --print-libdir) && ${ipython}/bin/ipython notebook --kernel=haskell
'';
profile = "${ihaskell.pname}-${ihaskell.version}/profile/profile.tar";

2
pkgs/development/tools/misc/autobuild/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
postInstall = ''
wrapProgram $out/bin/ab{put,build}-sourceforge \
--prefix PATH ":" "${openssh}/bin:${rsync}/bin"
--prefix PATH ":" "${stdenv.lib.makeBinPath [ openssh rsync ]}"
'';
meta = {

2
pkgs/development/tools/misc/drush/default.nix
View File

@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
mkdir -p "$out"
cp -r . "$out/src"
mkdir "$out/bin"
wrapProgram "$out/src/drush" --prefix PATH : "${which}/bin:${php}/bin:${bash}/bin:${coreutils}/bin:${ncurses.out}/bin"
wrapProgram "$out/src/drush" --prefix PATH : "${stdenv.lib.makeBinPath [ which php bash coreutils ncurses ]}"
ln -s "$out/src/drush" "$out/bin/drush"
'';
}

2
pkgs/development/tools/misc/kibana/default.nix
View File

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
mv * $out/libexec/kibana/
rm -r $out/libexec/kibana/node
makeWrapper $out/libexec/kibana/bin/kibana $out/bin/kibana \
--prefix PATH : "${nodejs}/bin:${coreutils}/bin:${which}/bin"
--prefix PATH : "${stdenv.lib.makeBinPath [ nodejs coreutils which ]}"
sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana
'';

2
pkgs/development/tools/misc/opengrok/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
cp -a * $out/
substituteInPlace $out/bin/OpenGrok --replace /bin/uname ${coreutils}/bin/uname
wrapProgram $out/bin/OpenGrok \
--prefix PATH : "${ctags}/bin:${git}/bin" \
--prefix PATH : "${stdenv.lib.makeBinPath [ ctags git ]}" \
--set JAVA_HOME "${jre}" \
--set OPENGROK_TOMCAT_BASE "/var/tomcat"
'';

2
pkgs/servers/elasticmq/default.nix
View File

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
cp bin/run.sh $out/bin/elasticmq
substituteInPlace $out/bin/elasticmq --replace '-DBASEDIR=$BASEDIR' '-DBASEDIR=''${ELASTICMQ_DATA_PREFIX:-.}'
wrapProgram $out/bin/elasticmq --prefix PATH : "${which}/bin:${jre}/bin"
wrapProgram $out/bin/elasticmq --prefix PATH : "${stdenv.lib.makeBinPath [ which jre ]}"
'';
meta = {

4
pkgs/servers/nosql/neo4j/default.nix
View File

@ -23,9 +23,9 @@ stdenv.mkDerivation rec {
mkdir -p "$out/bin"
makeWrapper "$out/share/neo4j/bin/neo4j" "$out/bin/neo4j" \
--prefix PATH : "${jre}/bin:${which}/bin:${gnused}/bin"
--prefix PATH : "${stdenv.lib.makeBinPath [ jre which gnused ]}"
makeWrapper "$out/share/neo4j/bin/neo4j-shell" "$out/bin/neo4j-shell" \
--prefix PATH : "${jre}/bin:${which}/bin:${gnused}/bin"
--prefix PATH : "${stdenv.lib.makeBinPath [ jre which gnused ]}"
'';
meta = with stdenv.lib; {

4
pkgs/tools/X11/xpra/default.nix
View File

@ -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
#'';

4
pkgs/tools/X11/xpra/gtk3.nix
View File

@ -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
#'';

2
pkgs/tools/backup/btrbk/default.nix
View File

@ -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; {

2
pkgs/tools/backup/duplicity/default.nix
View File

@ -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})"
'';

2
pkgs/tools/backup/store-backup/default.nix
View File

@ -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

2
pkgs/tools/cd-dvd/unetbootin/default.nix
View File

@ -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; {

2
pkgs/tools/graphics/pdfread/default.nix
View File

@ -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; {

2
pkgs/tools/misc/gparted/default.nix
View File

@ -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; {

2
pkgs/tools/misc/plowshare/default.nix
View File

@ -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
'';

2
pkgs/tools/misc/profile-cleaner/default.nix
View File

@ -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 = {

2
pkgs/tools/networking/openvpn/openvpn_learnaddress.nix
View File

@ -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 = {

4
pkgs/tools/networking/snabb/default.nix
View File

@ -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 = ''

2
pkgs/tools/security/prey/default.nix
View File

@ -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"
'';

2
pkgs/tools/typesetting/djvu2pdf/default.nix
View File

@ -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

2
pkgs/tools/typesetting/docbook2odf/default.nix
View File

@ -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]}"
'';

2
pkgs/tools/typesetting/xmlto/default.nix
View File

@ -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" \