From 3376e632475f7823cf5c9bac87e68e462db92b99 Mon Sep 17 00:00:00 2001
From: Florian Brandes <florian.brandes@posteo.de>
Date: Tue, 26 Nov 2024 15:53:17 +0100
Subject: [PATCH 1/3] firefox: remove removeReferencesTo

reverts f3d1410e08859e31bc91463e08666b9642bc9fa4

After the merge of #359098 this workarround for ca-derivations
isn't needed anymore.

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
---
 pkgs/applications/networking/browsers/firefox/wrapper.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 56314b66de49..f34bfdb6fc0f 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -19,7 +19,6 @@
 , sndio
 , libjack2
 , speechd-minimal
-, removeReferencesTo
 }:
 
 ## configurability of the wrapper itself
@@ -242,7 +241,7 @@ let
               };
             }));
 
-      nativeBuildInputs = [ makeWrapper lndir jq removeReferencesTo ];
+      nativeBuildInputs = [ makeWrapper lndir jq ];
       buildInputs = [ browser.gtk3 ];
 
 
@@ -417,9 +416,6 @@ let
       passthru = { unwrapped = browser; };
 
       disallowedRequisites = [ stdenv.cc ];
-      postInstall = ''
-        find "$out" -type f -exec remove-references-to -t ${stdenv.cc} '{}' +
-      '';
       meta = browser.meta // {
         inherit (browser.meta) description;
         mainProgram = launcherName;

From 5d1d70c1f7035c2e1fe475e3b57515c18120a150 Mon Sep 17 00:00:00 2001
From: Florian Brandes <florian.brandes@posteo.de>
Date: Tue, 26 Nov 2024 15:57:57 +0100
Subject: [PATCH 2/3] Revert "libwebsockets: fix build for ca-derivations"

This reverts commit 43fccb0535f447f87a00915e2231fb16c036c352.

After the merge of #359098 this workarround for ca-derivations
isn't needed anymore.

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
---
 pkgs/by-name/li/libwebsockets/package.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/libwebsockets/package.nix b/pkgs/by-name/li/libwebsockets/package.nix
index 8cdcd9d19560..af028888b23b 100644
--- a/pkgs/by-name/li/libwebsockets/package.nix
+++ b/pkgs/by-name/li/libwebsockets/package.nix
@@ -5,7 +5,6 @@
 , openssl
 , zlib
 , libuv
-, removeReferencesTo
   # External poll is required for e.g. mosquitto, but discouraged by the maintainer.
 , withExternalPoll ? false
 }:
@@ -25,7 +24,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ openssl zlib libuv ];
 
-  nativeBuildInputs = [ cmake removeReferencesTo ];
+  nativeBuildInputs = [ cmake ];
 
   cmakeFlags = [
     "-DLWS_WITH_PLUGINS=ON"
@@ -43,7 +42,6 @@ stdenv.mkDerivation rec {
   );
 
   postInstall = ''
-    find "$out" -type f -exec remove-references-to -t ${stdenv.cc.cc} '{}' +
     # Fix path that will be incorrect on move to "dev" output.
     substituteInPlace "$out/lib/cmake/libwebsockets/LibwebsocketsTargets-release.cmake" \
       --replace "\''${_IMPORT_PREFIX}" "$out"

From 0f6e04eb906fb47c2502000e1d42f84d9b91bbb0 Mon Sep 17 00:00:00 2001
From: Florian Brandes <florian.brandes@posteo.de>
Date: Tue, 26 Nov 2024 16:34:31 +0100
Subject: [PATCH 3/3] neovim: remove removeReferencesTo

reverts 9305ed35ec7f38c6fed16e9d6d0dcd788f007b4d

After the merge of #359098 this workarround for ca-derivations
isn't needed anymore.

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
---
 pkgs/by-name/ne/neovim-unwrapped/package.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/by-name/ne/neovim-unwrapped/package.nix b/pkgs/by-name/ne/neovim-unwrapped/package.nix
index fb185d85f646..0818c6fb9d85 100644
--- a/pkgs/by-name/ne/neovim-unwrapped/package.nix
+++ b/pkgs/by-name/ne/neovim-unwrapped/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  removeReferencesTo,
   cmake,
   gettext,
   msgpack-c,
@@ -163,7 +162,6 @@ stdenv.mkDerivation (
       cmake
       gettext
       pkg-config
-      removeReferencesTo
     ];
 
     # extra programs test via `make functionaltest`
@@ -189,9 +187,6 @@ stdenv.mkDerivation (
       sed -i src/nvim/po/CMakeLists.txt \
         -e "s|\$<TARGET_FILE:nvim|\${stdenv.hostPlatform.emulator buildPackages} &|g"
     '';
-    postInstall = ''
-      find "$out" -type f -exec remove-references-to -t ${stdenv.cc} '{}' +
-    '';
     # check that the above patching actually works
     outputChecks =
       let