Merge pull request #131846 from bobrik/ivan/prefixup-mc

mc: move signature breaking sed from post to pre fixup
This commit is contained in:
Pavol Rusnak 2021-07-28 20:41:55 +02:00 committed by GitHub
commit fcc1017b9c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -57,10 +57,12 @@ stdenv.mkDerivation rec {
--replace /bin/rm ${coreutils}/bin/rm
'';
postFixup = ''
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
'' + lib.optionalString (!stdenv.isDarwin) ''
'';
postFixup = lib.optionalString (!stdenv.isDarwin) ''
# libX11.so is loaded dynamically so autopatch doesn't detect it
patchelf \
--add-needed ${libX11}/lib/libX11.so \