diff options
| author | Adam C. Stephens <2071575+adamcstephens@users.noreply.github.com> | 2023-11-18 00:08:24 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-18 00:08:24 -0500 |
| commit | 005617587ee2b7c003388b4539b9120ebcc90e44 (patch) | |
| tree | e6e35fc8b1ab2d18338a3cef7451b4423d425d09 | |
| parent | cb2c96db15cb9d31003327a9a1ae5198fd888353 (diff) | |
| parent | 98d128a75c0c4f2919914c7713b19dab370a483c (diff) | |
| download | nixpkgs-005617587ee2b7c003388b4539b9120ebcc90e44.tar nixpkgs-005617587ee2b7c003388b4539b9120ebcc90e44.tar.gz nixpkgs-005617587ee2b7c003388b4539b9120ebcc90e44.tar.bz2 nixpkgs-005617587ee2b7c003388b4539b9120ebcc90e44.tar.lz nixpkgs-005617587ee2b7c003388b4539b9120ebcc90e44.tar.xz nixpkgs-005617587ee2b7c003388b4539b9120ebcc90e44.tar.zst nixpkgs-005617587ee2b7c003388b4539b9120ebcc90e44.zip | |
Merge pull request #268190 from reckenrode/difftastic-clang16
difftastic: fix build with clang 12+
| -rw-r--r-- | pkgs/tools/text/difftastic/default.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/tools/text/difftastic/default.nix b/pkgs/tools/text/difftastic/default.nix index 1db60b38a8d..98c3db975ed 100644 --- a/pkgs/tools/text/difftastic/default.nix +++ b/pkgs/tools/text/difftastic/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , testers , difftastic +, stdenv }: let @@ -32,6 +33,11 @@ rustPlatform.buildRustPackage rec { }; }; + # Work around https://github.com/NixOS/nixpkgs/issues/166205. + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; + }; + postPatch = '' patch -d $cargoDepsCopy/libmimalloc-sys-0.1.24/c_src/mimalloc \ -p1 < ${mimallocPatch} |