diff options
-rw-r--r-- | pkgs/applications/virtualization/docker/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/virtualization/singularity/default.nix | 4 | ||||
-rw-r--r-- | pkgs/desktops/deepin/dde-api/default.nix | 1 | ||||
-rw-r--r-- | pkgs/desktops/deepin/dde-daemon/default.nix | 1 | ||||
-rw-r--r-- | pkgs/desktops/deepin/startdde/default.nix | 1 | ||||
-rw-r--r-- | pkgs/development/go-modules/generic/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/go-packages/generic/default.nix | 3 | ||||
-rw-r--r-- | pkgs/os-specific/linux/fscrypt/default.nix | 4 |
8 files changed, 3 insertions, 15 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"; diff --git a/pkgs/desktops/deepin/dde-api/default.nix b/pkgs/desktops/deepin/dde-api/default.nix index a84fc9c2e02..07239f9d509 100644 --- a/pkgs/desktops/deepin/dde-api/default.nix +++ b/pkgs/desktops/deepin/dde-api/default.nix @@ -108,7 +108,6 @@ buildGoPackage rec { installPhase = '' make install PREFIX="$out" SYSTEMD_LIB_DIR="$out/lib" -C go/src/${goPackagePath} mv $out/share/gocode $out/share/go - remove-references-to -t ${go} $out/lib/deepin-api/* ''; postFixup = '' diff --git a/pkgs/desktops/deepin/dde-daemon/default.nix b/pkgs/desktops/deepin/dde-daemon/default.nix index c4edcef15af..8a36446491f 100644 --- a/pkgs/desktops/deepin/dde-daemon/default.nix +++ b/pkgs/desktops/deepin/dde-daemon/default.nix @@ -134,7 +134,6 @@ buildGoPackage rec { installPhase = '' make install PREFIX="$out" -C go/src/${goPackagePath} - remove-references-to -t ${go} $out/lib/deepin-daemon/* searchHardCodedPaths $out ''; diff --git a/pkgs/desktops/deepin/startdde/default.nix b/pkgs/desktops/deepin/startdde/default.nix index 75b36e85de3..ab17f04db68 100644 --- a/pkgs/desktops/deepin/startdde/default.nix +++ b/pkgs/desktops/deepin/startdde/default.nix @@ -139,7 +139,6 @@ buildGoPackage rec { installPhase = '' make install PREFIX="$out" -C go/src/${goPackagePath} rm -rf $out/share/lightdm # this is uselesss for NixOS - remove-references-to -t ${go} $out/sbin/* ''; postFixup = '' diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 402c3e781ad..7db4992d1d6 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -235,7 +235,7 @@ let ''; preFixup = (args.preFixup or "") + '' - find $out/bin -type f -exec ${removeExpr removeReferences} '{}' + || true + find $out/{bin,libexec,lib} -type f 2>/dev/null | xargs -r ${removeExpr removeReferences} || true ''; strictDeps = true; diff --git a/pkgs/development/go-packages/generic/default.nix b/pkgs/development/go-packages/generic/default.nix index 9d3c7c3d573..de0a35b6934 100644 --- a/pkgs/development/go-packages/generic/default.nix +++ b/pkgs/development/go-packages/generic/default.nix @@ -211,8 +211,7 @@ let ''; preFixup = preFixup + '' - find $out/bin -type f -exec ${removeExpr removeReferences} '{}' + || true - find $out/libexec -type f -exec ${removeExpr removeReferences} '{}' + || true + find $out/{bin,libexec,lib} -type f 2>/dev/null | xargs -r ${removeExpr removeReferences} || true ''; strictDeps = true; diff --git a/pkgs/os-specific/linux/fscrypt/default.nix b/pkgs/os-specific/linux/fscrypt/default.nix index 1086e5ece04..000400e4cdf 100644 --- a/pkgs/os-specific/linux/fscrypt/default.nix +++ b/pkgs/os-specific/linux/fscrypt/default.nix @@ -34,10 +34,6 @@ buildGoModule rec { make install ''; - preFixup = '' - remove-references-to -t ${fscrypt-experimental.go} $out/lib/security/pam_fscrypt.so - ''; - meta = with stdenv.lib; { description = "A high-level tool for the management of Linux filesystem encryption"; |