diff options
| author | Joachim Fasting <joachifm@fastmail.fm> | 2017-03-11 15:07:45 +0100 |
|---|---|---|
| committer | Joachim Fasting <joachifm@fastmail.fm> | 2017-03-11 15:17:26 +0100 |
| commit | 061ff21bbf5ca1df9f956756c923613e0e7301d5 (patch) | |
| tree | 301c5bd44ade49da01b6a557dfb3ee21a30b45a7 /pkgs/applications/networking/cluster/kubernetes | |
| parent | 0a7673d2029ef69175b8e3ce41677965edde371b (diff) | |
| download | nixlib-061ff21bbf5ca1df9f956756c923613e0e7301d5.tar nixlib-061ff21bbf5ca1df9f956756c923613e0e7301d5.tar.gz nixlib-061ff21bbf5ca1df9f956756c923613e0e7301d5.tar.bz2 nixlib-061ff21bbf5ca1df9f956756c923613e0e7301d5.tar.lz nixlib-061ff21bbf5ca1df9f956756c923613e0e7301d5.tar.xz nixlib-061ff21bbf5ca1df9f956756c923613e0e7301d5.tar.zst nixlib-061ff21bbf5ca1df9f956756c923613e0e7301d5.zip | |
kubernetes: use removeReferencesTo
Diffstat (limited to 'pkgs/applications/networking/cluster/kubernetes')
| -rw-r--r-- | pkgs/applications/networking/cluster/kubernetes/default.nix | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 952fd8fe9b6e..ecb2cd65a37c 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, which, go, go-bindata, makeWrapper, rsync +{ stdenv, lib, fetchFromGitHub, removeReferencesTo, which, go, go-bindata, makeWrapper, rsync , iptables, coreutils , components ? [ "cmd/kubeadm" @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { sha256 = "1ps9bn5gqknyjv0b9jvp7xg3cyd4anq11j785p22347al0b8w81v"; }; - buildInputs = [ makeWrapper which go rsync go-bindata ]; + buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ]; outputs = ["out" "man" "pause"]; @@ -59,12 +59,7 @@ stdenv.mkDerivation rec { ''; preFixup = '' - # Remove references to go compiler - while read file; do - cat $file | sed "s,${go},$(echo "${go}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" > $file.tmp - mv $file.tmp $file - chmod +x $file - done < <(find $out/bin $pause/bin -type f 2>/dev/null) + find $out/bin $pause/bin -type f -exec remove-references-to -t ${go} '{}' + ''; meta = { |