diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-09-15 07:58:52 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-09-15 07:58:52 +0000 |
| commit | 9d1daa60832979d5d361dfdac136fb9e5a1af2c5 (patch) | |
| tree | 5192dd85903cb092cf7dff0e3403387b3b683d84 /nixpkgs/pkgs/development/compilers/llvm/10/libcxxabi/default.nix | |
| parent | 67cdfc7d42f721bf85814af5a0095fb9f9ea455d (diff) | |
| parent | f2ea252d23ebc9a5336bf6a61e0644921f64e67c (diff) | |
| download | nixlib-9d1daa60832979d5d361dfdac136fb9e5a1af2c5.tar nixlib-9d1daa60832979d5d361dfdac136fb9e5a1af2c5.tar.gz nixlib-9d1daa60832979d5d361dfdac136fb9e5a1af2c5.tar.bz2 nixlib-9d1daa60832979d5d361dfdac136fb9e5a1af2c5.tar.lz nixlib-9d1daa60832979d5d361dfdac136fb9e5a1af2c5.tar.xz nixlib-9d1daa60832979d5d361dfdac136fb9e5a1af2c5.tar.zst nixlib-9d1daa60832979d5d361dfdac136fb9e5a1af2c5.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/development/compilers/llvm/10/libcxxabi/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/compilers/llvm/10/libcxxabi/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/compilers/llvm/10/libcxxabi/default.nix b/nixpkgs/pkgs/development/compilers/llvm/10/libcxxabi/default.nix index d59191dfd724..c4eba56a6b81 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/10/libcxxabi/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/10/libcxxabi/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation { '' + lib.optionalString stdenv.hostPlatform.isMusl '' patch -p1 -d $(ls -d libcxx-*) -i ${../../libcxx-0001-musl-hacks.patch} '' + lib.optionalString stdenv.hostPlatform.isWasm '' - patch -p1 -d $(ls -d llvm-*) -i ${./wasm.patch} + patch -p1 -d $(ls -d llvm-*) -i ${../../common/libcxxabi/wasm.patch} ''; patches = [ - ./no-threads.patch + ../../common/libcxxabi/no-threads.patch ./gnu-install-dirs.patch ]; |