diff options
author | obadz <obadz-git@obadz.com> | 2016-08-23 18:50:06 +0100 |
---|---|---|
committer | obadz <obadz-git@obadz.com> | 2016-08-23 18:50:06 +0100 |
commit | 0e8d2725dcc1aef5c56e63c939249b27190f6367 (patch) | |
tree | 654e83b5f539b31947ee5011a0d1df797bf4c75d /pkgs/applications/networking/cluster/kubernetes/default.nix | |
parent | 13c04c837db0f69705cfa4478c513b2230243ca2 (diff) | |
parent | 415e1983ca650777d476d39de1db61a9e9877621 (diff) | |
download | nixpkgs-0e8d2725dcc1aef5c56e63c939249b27190f6367.tar nixpkgs-0e8d2725dcc1aef5c56e63c939249b27190f6367.tar.gz nixpkgs-0e8d2725dcc1aef5c56e63c939249b27190f6367.tar.bz2 nixpkgs-0e8d2725dcc1aef5c56e63c939249b27190f6367.tar.lz nixpkgs-0e8d2725dcc1aef5c56e63c939249b27190f6367.tar.xz nixpkgs-0e8d2725dcc1aef5c56e63c939249b27190f6367.tar.zst nixpkgs-0e8d2725dcc1aef5c56e63c939249b27190f6367.zip |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/applications/networking/cluster/kubernetes/default.nix')
-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 bc3247c4b3d..75083409ba7 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 ''; |