diff options
author | Joachim Fasting <joachifm@fastmail.fm> | 2017-03-11 15:08:09 +0100 |
---|---|---|
committer | Joachim Fasting <joachifm@fastmail.fm> | 2017-03-11 15:17:36 +0100 |
commit | d082a29c3a0eeb014b678c2797329389274fc4a2 (patch) | |
tree | 97f75cfdca23e2530c582bef83fdaec9e6c0163c /pkgs/applications/virtualization/runc | |
parent | c4fe1960877dc8d6d7dfa006bcfa0b77e5d9792f (diff) | |
download | nixpkgs-d082a29c3a0eeb014b678c2797329389274fc4a2.tar nixpkgs-d082a29c3a0eeb014b678c2797329389274fc4a2.tar.gz nixpkgs-d082a29c3a0eeb014b678c2797329389274fc4a2.tar.bz2 nixpkgs-d082a29c3a0eeb014b678c2797329389274fc4a2.tar.lz nixpkgs-d082a29c3a0eeb014b678c2797329389274fc4a2.tar.xz nixpkgs-d082a29c3a0eeb014b678c2797329389274fc4a2.tar.zst nixpkgs-d082a29c3a0eeb014b678c2797329389274fc4a2.zip |
runc: use removeReferencesTo
Diffstat (limited to 'pkgs/applications/virtualization/runc')
-rw-r--r-- | pkgs/applications/virtualization/runc/default.nix | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index 7f19121b7f5..3ce183d90e2 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, go-md2man +{ stdenv, lib, fetchFromGitHub, fetchpatch, removeReferencesTo, go-md2man , go, pkgconfig, libapparmor, apparmor-parser, libseccomp }: with lib; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { hardeningDisable = ["fortify"]; - buildInputs = [ go-md2man go pkgconfig libseccomp libapparmor apparmor-parser ]; + buildInputs = [ removeReferencesTo go-md2man go pkgconfig libseccomp libapparmor apparmor-parser ]; makeFlags = ''BUILDTAGS+=seccomp BUILDTAGS+=apparmor''; @@ -61,10 +61,7 @@ stdenv.mkDerivation rec { ''; preFixup = '' - # remove references to go compiler - while read file; do - sed -ri "s,${go},$(echo "${go}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" $file - done < <(find $out/bin -type f 2>/dev/null) + find $out/bin -type f -exec remove-references-to -t ${go} '{}' + ''; meta = { |