JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

runc: use removeReferencesTo

Browse Source
This commit is contained in:
Joachim Fasting 2017-03-11 15:08:09 +01:00
parent c4fe196087
commit d082a29c3a
No known key found for this signature in database
GPG Key ID: 7544761007FE4E08
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/virtualization/runc/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch, go-md2man { stdenv, lib, fetchFromGitHub, fetchpatch, removeReferencesTo, go-md2man
, go, pkgconfig, libapparmor, apparmor-parser, libseccomp }: , go, pkgconfig, libapparmor, apparmor-parser, libseccomp }:
with lib; with lib;
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
hardeningDisable = ["fortify"]; 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''; makeFlags = ''BUILDTAGS+=seccomp BUILDTAGS+=apparmor'';
@ -61,10 +61,7 @@ stdenv.mkDerivation rec {
''; '';
preFixup = '' preFixup = ''
# remove references to go compiler find $out/bin -type f -exec remove-references-to -t ${go} '{}' +
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)
''; '';
meta = { meta = {