Merge pull request #131592 from Artturin/mclib

mc: dont add libX11.so on darwin
This commit is contained in:
Ben Siraphob 2021-07-27 01:58:37 +07:00 committed by GitHub
commit db4dc04466
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
postFixup = '' postFixup = ''
# remove unwanted build-dependency references # 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 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) ''
# libX11.so is loaded dynamically so autopatch doesn't detect it # libX11.so is loaded dynamically so autopatch doesn't detect it
patchelf \ patchelf \
--add-needed ${libX11}/lib/libX11.so \ --add-needed ${libX11}/lib/libX11.so \