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

docker: use removeReferencesTo

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

13
pkgs/applications/virtualization/docker/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper, pkgconfig, go-md2man { stdenv, lib, fetchFromGitHub, makeWrapper, removeReferencesTo, pkgconfig
, go, containerd, runc, docker-proxy, tini , go-md2man, go, containerd, runc, docker-proxy, tini
, sqlite, iproute, bridge-utils, devicemapper, systemd , sqlite, iproute, bridge-utils, devicemapper, systemd
, btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs , btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs
, procps , procps
@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
}); });
buildInputs = [ buildInputs = [
makeWrapper pkgconfig go-md2man go makeWrapper removeReferencesTo pkgconfig go-md2man go
sqlite devicemapper btrfs-progs systemd sqlite devicemapper btrfs-progs systemd
]; ];
@ -126,12 +126,7 @@ stdenv.mkDerivation rec {
''; '';
preFixup = '' preFixup = ''
# remove references to go compiler, gcc and glibc find $out -type f -exec remove-references-to -t ${go} -t ${stdenv.cc.cc} -t ${stdenv.glibc.dev} '{}' +
while read file; do
sed -ri "s,${go},$(echo "${go}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" $file
sed -ri "s,${stdenv.cc.cc},$(echo "${stdenv.cc.cc}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" $file
sed -ri "s,${stdenv.glibc.dev},$(echo "${stdenv.glibc.dev}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" $file
done < <(find $out -type f 2>/dev/null)
''; '';
meta = { meta = {