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/networking | |
| 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/networking')
| -rw-r--r-- | pkgs/tools/networking/openvpn/openvpn_learnaddress.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/networking/snabb/default.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix b/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix index 748f41c90538..706f2434a955 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 f6b115805982..3b405561ef93 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 = '' |