From eab48f5a1bff12467f196c182f349ce11fc63e06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 28 Aug 2020 12:50:22 +0100
Subject: [PATCH 1/7] buildGo{module,package}: also fixup `$out/{libexec,lib}`

also suppresses errors if those directories are not present
---
 pkgs/development/go-modules/generic/default.nix  | 2 +-
 pkgs/development/go-packages/generic/default.nix | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 402c3e781adb..7db4992d1d61 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 9d3c7c3d5733..de0a35b69343 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;

From 7aa189970ab7454b6df32d51813d7b1e1ba738ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 28 Aug 2020 13:03:56 +0100
Subject: [PATCH 2/7] docker: simplify remove-references-to

---
 pkgs/applications/virtualization/docker/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 6b76ea24e3da..727b56344498 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} '{}' +
     '';

From e680fcaa3baee69ff0f7ed547ef9b90ea9f9fe0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 28 Aug 2020 13:03:21 +0100
Subject: [PATCH 3/7] fscrypt: remove unneeded remove-references-to

---
 pkgs/os-specific/linux/fscrypt/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/os-specific/linux/fscrypt/default.nix b/pkgs/os-specific/linux/fscrypt/default.nix
index 1086e5ece046..000400e4cdf9 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";

From dee0f69844223ff47f3211c72272f69357625cfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 28 Aug 2020 13:12:18 +0100
Subject: [PATCH 4/7] singularity: remove remove-references-to call

---
 pkgs/applications/virtualization/singularity/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix
index 7154b8e614c8..bfa0e0e54469 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";

From 2fe70decbd2e75c8e9c8db56cf882a4aa3937432 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 28 Aug 2020 13:21:28 +0100
Subject: [PATCH 5/7] deepin.dde-api: remove remove-references-to

---
 pkgs/desktops/deepin/dde-api/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/desktops/deepin/dde-api/default.nix b/pkgs/desktops/deepin/dde-api/default.nix
index a84fc9c2e021..07239f9d509a 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 = ''

From dbab6f2b3d2701fb9ddc542f07c9f2ab3513bc54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 28 Aug 2020 13:21:44 +0100
Subject: [PATCH 6/7] deepin.dde-deamon: remove remove-references-to

---
 pkgs/desktops/deepin/dde-daemon/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/desktops/deepin/dde-daemon/default.nix b/pkgs/desktops/deepin/dde-daemon/default.nix
index c4edcef15af3..8a36446491f4 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
   '';
 

From 7c486d35fcbd34f58c02a21d992907b7697162de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 28 Aug 2020 13:21:53 +0100
Subject: [PATCH 7/7] deepin.startdde: remove remove-references-to

---
 pkgs/desktops/deepin/startdde/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/desktops/deepin/startdde/default.nix b/pkgs/desktops/deepin/startdde/default.nix
index 75b36e85de3c..ab17f04db68f 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 = ''