diff options
author | Nikolay Amiantov <ab@fmap.me> | 2016-04-13 15:53:51 +0300 |
---|---|---|
committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-13 22:09:41 +0300 |
commit | 8b7ebaffeb3087ef18ff5c0f38cc3f44f7f8124e (patch) | |
tree | 8bab721107fae818dad896a0876d50d3d0a0d981 /pkgs/tools | |
parent | e26119619f7ce64b065e692ba0cd31f53b9ef637 (diff) |
replace makeSearchPath tree-wise to take care of possible multiple outputs
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/X11/bumblebee/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/cd-dvd/brasero/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/graphics/fgallery/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/graphics/imgur-screenshot/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/graphics/imgurbash2/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/tlp/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/xfstests/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/security/pass/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/security/pass/rofi-pass.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/security/pcsctools/default.nix | 2 |
10 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix index 2206905aa3e44..d1f2318d6d45a 100644 --- a/pkgs/tools/X11/bumblebee/default.nix +++ b/pkgs/tools/X11/bumblebee/default.nix @@ -43,7 +43,7 @@ let nvidiaLibs = lib.makeLibraryPath nvidia_x11s; - bbdPath = lib.makeSearchPath "bin" [ module_init_tools xorgserver ]; + bbdPath = lib.makeBinPath [ module_init_tools xorgserver ]; bbdLibs = lib.makeLibraryPath [ libX11 libXext ]; xmodules = lib.concatStringsSep "," (map (x: "${x}/lib/xorg/modules") ([ xorgserver ] ++ lib.optional (!useNvidia) xf86videonouveau)); diff --git a/pkgs/tools/cd-dvd/brasero/default.nix b/pkgs/tools/cd-dvd/brasero/default.nix index 3185242f5ce4d..91a5440df3ec8 100644 --- a/pkgs/tools/cd-dvd/brasero/default.nix +++ b/pkgs/tools/cd-dvd/brasero/default.nix @@ -5,7 +5,7 @@ let major = "3.12"; minor = "0"; - binpath = stdenv.lib.makeSearchPath "bin" [ dvdauthor cdrdao dvdplusrwtools cdrtools ]; + binpath = stdenv.lib.makeBinPath [ dvdauthor cdrdao dvdplusrwtools cdrtools ]; in stdenv.mkDerivation rec { version = "${major}.${minor}"; diff --git a/pkgs/tools/graphics/fgallery/default.nix b/pkgs/tools/graphics/fgallery/default.nix index 6b8de80ee70e8..4b263b555d211 100644 --- a/pkgs/tools/graphics/fgallery/default.nix +++ b/pkgs/tools/graphics/fgallery/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { wrapProgram "$out/share/fgallery/fgallery" \ --set PERL5LIB "$PERL5LIB" \ - --set PATH "${stdenv.lib.makeSearchPath "bin" + --set PATH "${stdenv.lib.makeBinPath [ coreutils zip imagemagick pngcrush lcms2 fbida ]}" ''; diff --git a/pkgs/tools/graphics/imgur-screenshot/default.nix b/pkgs/tools/graphics/imgur-screenshot/default.nix index 777139d47feef..26af637300ee7 100644 --- a/pkgs/tools/graphics/imgur-screenshot/default.nix +++ b/pkgs/tools/graphics/imgur-screenshot/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, makeWrapper, curl, gnugrep, libnotify, scrot, which, xclip }: -let deps = stdenv.lib.makeSearchPath "bin" [ curl gnugrep libnotify scrot which xclip ]; +let deps = stdenv.lib.makeBinPath [ curl gnugrep libnotify scrot which xclip ]; in stdenv.mkDerivation rec { version = "1.5.4"; name = "imgur-screenshot-${version}"; @@ -26,4 +26,4 @@ in stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ lw ]; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/graphics/imgurbash2/default.nix b/pkgs/tools/graphics/imgurbash2/default.nix index 5e7b4dcb38726..99ef87ca5dfec 100644 --- a/pkgs/tools/graphics/imgurbash2/default.nix +++ b/pkgs/tools/graphics/imgurbash2/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cat <<EOF >$out/bin/imgurbash2 #!${bash}/bin/bash - PATH=${stdenv.lib.makeSearchPath "bin" [curl xsel]}:\$PATH + PATH=${stdenv.lib.makeBinPath [curl xsel]}:\$PATH EOF cat imgurbash2 >> $out/bin/imgurbash2 chmod +x $out/bin/imgurbash2 diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix index 7b57458bd3f44..e20dc850008ae 100644 --- a/pkgs/tools/misc/tlp/default.nix +++ b/pkgs/tools/misc/tlp/default.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation { buildInputs = [ perl ]; - paths = lib.makeSearchPath "bin" + paths = lib.makeBinPath ([ iw rfkill hdparm ethtool inetutils systemd module_init_tools pciutils smartmontools x86_energy_perf_policy gawk gnugrep coreutils ] diff --git a/pkgs/tools/misc/xfstests/default.nix b/pkgs/tools/misc/xfstests/default.nix index b7c1795c03728..957582a3687f7 100644 --- a/pkgs/tools/misc/xfstests/default.nix +++ b/pkgs/tools/misc/xfstests/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation { ln -s @out@/lib/xfstests/$f $f done - export PATH=${lib.makeSearchPath "bin" [acl attr bc e2fsprogs fio gawk libcap_progs lvm2 perl procps psmisc su utillinux which xfsprogs]}:$PATH + export PATH=${lib.makeBinPath [acl attr bc e2fsprogs fio gawk libcap_progs lvm2 perl procps psmisc su utillinux which xfsprogs]}:$PATH exec ./check "$@" ''; diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index 2f6769b929b87..534e06814e2b5 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { '' else ""} ''; - wrapperPath = with stdenv.lib; makeSearchPath "bin/" ([ + wrapperPath = with stdenv.lib; makeBinPath ([ coreutils gnused getopt diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/tools/security/pass/rofi-pass.nix index 94dca5dca6800..45cd0f0e20b0e 100644 --- a/pkgs/tools/security/pass/rofi-pass.nix +++ b/pkgs/tools/security/pass/rofi-pass.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { cp -a $src/config.example $out/share/doc/rofi-pass/config.example ''; - wrapperPath = with stdenv.lib; makeSearchPath "bin/" [ + wrapperPath = with stdenv.lib; makeBinPath [ coreutils findutils gnugrep diff --git a/pkgs/tools/security/pcsctools/default.nix b/pkgs/tools/security/pcsctools/default.nix index af0090cdf965e..2932143fa0e10 100644 --- a/pkgs/tools/security/pcsctools/default.nix +++ b/pkgs/tools/security/pcsctools/default.nix @@ -3,7 +3,7 @@ , perl, pcscperl, Glib, Gtk2, Pango }: -let deps = lib.makeSearchPath "bin" [ wget coreutils ]; +let deps = lib.makeBinPath [ wget coreutils ]; in stdenv.mkDerivation rec { name = "pcsc-tools-1.4.25"; |