Remove ca-derivations removeReferencesTo (#359318)
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user