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/applications/networking/cluster/kubernetes | |
| 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/applications/networking/cluster/kubernetes')
| -rw-r--r-- | pkgs/applications/networking/cluster/kubernetes/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index bc3247c4b3db..75083409ba7b 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -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 ''; |