diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-29 00:01:33 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-29 00:01:33 +0000 |
| commit | 4fc7a31edb195d666c4e782c56cd5ad32f8ab3bc (patch) | |
| tree | 009d65e0b0351612af7de7970317a9890fdc1657 /pkgs/tools/misc/mc/default.nix | |
| parent | 6fcda9f1ec27db14412a2103281b4b14f806066a (diff) | |
| parent | db809100db91e97c118a70c3879307afdbf1dbb7 (diff) | |
| download | nixpkgs-4fc7a31edb195d666c4e782c56cd5ad32f8ab3bc.tar nixpkgs-4fc7a31edb195d666c4e782c56cd5ad32f8ab3bc.tar.gz nixpkgs-4fc7a31edb195d666c4e782c56cd5ad32f8ab3bc.tar.bz2 nixpkgs-4fc7a31edb195d666c4e782c56cd5ad32f8ab3bc.tar.lz nixpkgs-4fc7a31edb195d666c4e782c56cd5ad32f8ab3bc.tar.xz nixpkgs-4fc7a31edb195d666c4e782c56cd5ad32f8ab3bc.tar.zst nixpkgs-4fc7a31edb195d666c4e782c56cd5ad32f8ab3bc.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/misc/mc/default.nix')
| -rw-r--r-- | pkgs/tools/misc/mc/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index cddda2c6a62..cb577ee333d 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -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 \ |