diff options
| author | Joachim Fasting <joachifm@fastmail.fm> | 2017-03-11 15:08:04 +0100 |
|---|---|---|
| committer | Joachim Fasting <joachifm@fastmail.fm> | 2017-03-11 15:17:34 +0100 |
| commit | c4fe1960877dc8d6d7dfa006bcfa0b77e5d9792f (patch) | |
| tree | 14b87de4587b0dd87ce55e81f9f5c966c8501683 /pkgs/applications/virtualization | |
| parent | 0c6a1eaa434ce6d0186ad1777de68c553cf6ccc6 (diff) | |
| download | nixlib-c4fe1960877dc8d6d7dfa006bcfa0b77e5d9792f.tar nixlib-c4fe1960877dc8d6d7dfa006bcfa0b77e5d9792f.tar.gz nixlib-c4fe1960877dc8d6d7dfa006bcfa0b77e5d9792f.tar.bz2 nixlib-c4fe1960877dc8d6d7dfa006bcfa0b77e5d9792f.tar.lz nixlib-c4fe1960877dc8d6d7dfa006bcfa0b77e5d9792f.tar.xz nixlib-c4fe1960877dc8d6d7dfa006bcfa0b77e5d9792f.tar.zst nixlib-c4fe1960877dc8d6d7dfa006bcfa0b77e5d9792f.zip | |
docker: use removeReferencesTo
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/docker/default.nix | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 903ee98a0e1b..f2db629336c2 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, pkgconfig, go-md2man -, go, containerd, runc, docker-proxy, tini +{ stdenv, lib, fetchFromGitHub, makeWrapper, removeReferencesTo, pkgconfig +, go-md2man, go, containerd, runc, docker-proxy, tini , sqlite, iproute, bridge-utils, devicemapper, systemd , btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs , procps @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { }); buildInputs = [ - makeWrapper pkgconfig go-md2man go + makeWrapper removeReferencesTo pkgconfig go-md2man go sqlite devicemapper btrfs-progs systemd ]; @@ -126,12 +126,7 @@ stdenv.mkDerivation rec { ''; preFixup = '' - # remove references to go compiler, gcc and glibc - 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) + find $out -type f -exec remove-references-to -t ${go} -t ${stdenv.cc.cc} -t ${stdenv.glibc.dev} '{}' + ''; meta = { |