diff options
| author | Linus Heckemann <git@sphalerite.org> | 2020-08-30 16:44:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-30 16:44:08 +0200 |
| commit | bba8571c39d41ac432fd74922e53737fb11eb85d (patch) | |
| tree | f0d2f72d11a1c937e39340de3b6779dc04e26c81 /pkgs/applications/virtualization | |
| parent | f1d233e5be8be745f36254bec63fd45e97f6a25c (diff) | |
| parent | 7c486d35fcbd34f58c02a21d992907b7697162de (diff) | |
| download | nixpkgs-bba8571c39d41ac432fd74922e53737fb11eb85d.tar nixpkgs-bba8571c39d41ac432fd74922e53737fb11eb85d.tar.gz nixpkgs-bba8571c39d41ac432fd74922e53737fb11eb85d.tar.bz2 nixpkgs-bba8571c39d41ac432fd74922e53737fb11eb85d.tar.lz nixpkgs-bba8571c39d41ac432fd74922e53737fb11eb85d.tar.xz nixpkgs-bba8571c39d41ac432fd74922e53737fb11eb85d.tar.zst nixpkgs-bba8571c39d41ac432fd74922e53737fb11eb85d.zip | |
Merge pull request #96538 from Mic92/go-references
buildGoModule/buildGoPackage: Remove go references from lib,libexec
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/docker/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/virtualization/singularity/default.nix | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 7c26ada9392..78d6631c2dc 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -180,7 +180,7 @@ rec { ''; preFixup = '' - find $out -type f -exec remove-references-to -t ${go} -t ${stdenv.cc.cc} '{}' + + find $out -type f -exec remove-references-to -t ${stdenv.cc.cc} '{}' + '' + optionalString (stdenv.isLinux) '' find $out -type f -exec remove-references-to -t ${stdenv.glibc.dev} '{}' + ''; diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index 7154b8e614c..bfa0e0e5446 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -67,10 +67,6 @@ buildGoPackage rec { runHook postInstall ''; - postFixup = '' - find $out/libexec/ -type f -executable -exec remove-references-to -t ${go} '{}' + || true - ''; - meta = with stdenv.lib; { homepage = "http://www.sylabs.io/"; description = "Application containers for linux"; |