Merge pull request #187263 from trofi/mc-avoid-configure-args-embedding

mc: stop retaining configure arguments in the final binary
This commit is contained in:
Sergei Trofimovich 2022-08-18 12:14:47 +01:00 committed by GitHub
commit 2ebee31c74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -67,6 +67,10 @@ stdenv.mkDerivation rec {
"PERL=${perl}/bin/perl"
# used for .hlp generation at build time:
"PERL_FOR_BUILD=${buildPackages.perl}/bin/perl"
# configure arguments have a bunch of build-only dependencies.
# Avoid their retention in final closure.
"--disable-configure-args"
];
postPatch = ''
@ -77,11 +81,6 @@ stdenv.mkDerivation rec {
--replace /bin/cat ${coreutils}/bin/cat
'';
preFixup = ''
# remove unwanted build-dependency references
sed -i -e "s!PKG_CONFIG_PATH=''${PKG_CONFIG_PATH}!PKG_CONFIG_PATH=$(echo "$PKG_CONFIG_PATH" | sed -e 's/./0/g')!" $out/bin/mc
'';
postFixup = lib.optionalString (!stdenv.isDarwin) ''
# libX11.so is loaded dynamically so autopatch doesn't detect it
patchelf \