Merge pull request #272434 from XYenon/master

ouch: fix build on darwin

authored by figsoda and committed by GitHub 23eb27c2 f800dd16

+9 -1
+9 -1
pkgs/tools/compression/ouch/default.nix
··· 7 7 , xz 8 8 , zlib 9 9 , zstd 10 + , stdenv 10 11 }: 11 12 12 13 rustPlatform.buildRustPackage rec { ··· 28 29 29 30 buildFeatures = [ "zstd/pkg-config" ]; 30 31 32 + preCheck = '' 33 + substituteInPlace tests/ui.rs \ 34 + --replace 'format!(r"/private{path}")' 'path.to_string()' 35 + ''; 36 + 31 37 postInstall = '' 32 38 installManPage artifacts/*.1 33 39 installShellCompletion artifacts/ouch.{bash,fish} --zsh artifacts/_ouch 34 40 ''; 35 41 36 - env.OUCH_ARTIFACTS_FOLDER = "artifacts"; 42 + env = { OUCH_ARTIFACTS_FOLDER = "artifacts"; } // 43 + # Work around https://github.com/NixOS/nixpkgs/issues/166205. 44 + lib.optionalAttrs stdenv.cc.isClang { NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; }; 37 45 38 46 meta = with lib; { 39 47 description = "A command-line utility for easily compressing and decompressing files and directories";