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/os-specific/linux | |
| parent | e26119619f7ce64b065e692ba0cd31f53b9ef637 (diff) | |
| download | nixlib-8b7ebaffeb3087ef18ff5c0f38cc3f44f7f8124e.tar nixlib-8b7ebaffeb3087ef18ff5c0f38cc3f44f7f8124e.tar.gz nixlib-8b7ebaffeb3087ef18ff5c0f38cc3f44f7f8124e.tar.bz2 nixlib-8b7ebaffeb3087ef18ff5c0f38cc3f44f7f8124e.tar.lz nixlib-8b7ebaffeb3087ef18ff5c0f38cc3f44f7f8124e.tar.xz nixlib-8b7ebaffeb3087ef18ff5c0f38cc3f44f7f8124e.tar.zst nixlib-8b7ebaffeb3087ef18ff5c0f38cc3f44f7f8124e.zip | |
replace makeSearchPath tree-wise to take care of possible multiple outputs
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/fanctl/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/pipework/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/pm-utils/default.nix | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/fanctl/default.nix b/pkgs/os-specific/linux/fanctl/default.nix index cb188b56c06d..f60951f5541e 100644 --- a/pkgs/os-specific/linux/fanctl/default.nix +++ b/pkgs/os-specific/linux/fanctl/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace fanctl \ --replace '@PATH@' \ - '${lib.makeSearchPath "bin" [ + '${lib.makeBinPath [ gnugrep gawk coreutils bridge-utils iproute dnsmasq iptables kmod utillinux gnused glibc # needed for getent diff --git a/pkgs/os-specific/linux/pipework/default.nix b/pkgs/os-specific/linux/pipework/default.nix index 225515cb70a2..a686bd5496d7 100644 --- a/pkgs/os-specific/linux/pipework/default.nix +++ b/pkgs/os-specific/linux/pipework/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp pipework $out/bin wrapProgram $out/bin/pipework --prefix PATH : \ - ${lib.makeSearchPath "bin" [ bridge-utils iproute lxc openvswitch docker busybox dhcpcd dhcp ]}; + ${lib.makeBinPath [ bridge-utils iproute lxc openvswitch docker busybox dhcpcd dhcp ]}; ''; meta = with lib; { description = "Software-Defined Networking tools for LXC"; diff --git a/pkgs/os-specific/linux/pm-utils/default.nix b/pkgs/os-specific/linux/pm-utils/default.nix index 4fb7fc8cb0b8..19315ec2d0ba 100644 --- a/pkgs/os-specific/linux/pm-utils/default.nix +++ b/pkgs/os-specific/linux/pm-utils/default.nix @@ -3,10 +3,10 @@ let - binPath = stdenv.lib.makeSearchPath "bin" + binPath = stdenv.lib.makeBinPath [ coreutils gnugrep utillinux module_init_tools procps kbd dbus_tools ]; - sbinPath = stdenv.lib.makeSearchPath "sbin" + sbinPath = stdenv.lib.makeSearchPathOutputs "sbin" ["bin"] [ procps ]; in |