pyrox.dev
llvmPackages_15.libcxx: fix the generated linker script
See:
- https://github.com/NixOS/nixpkgs/issues/214524#issuecomment-1429146432
- https://github.com/llvm/llvm-project/commit/57c7bb3ec89565c68f858d316504668f9d214d59
- https://reviews.llvm.org/D133566
We can drop this patch in `llvmPackages_16`.
Fixes #214524.
authored by
Rahul Butani
and committed by
Artturin
0251e264
306de1a8
+10
-1
pkgs/development/compilers/llvm/15/libcxx/default.nix
+10
-1
pkgs/development/compilers/llvm/15/libcxx/default.nix
···
1
1
{ lib, stdenv, llvm_meta
2
-
, monorepoSrc, runCommand
2
+
, monorepoSrc, runCommand, fetchpatch
3
3
, cmake, ninja, python3, fixDarwinDylibNames, version
4
4
, cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else libcxxabi
5
5
, libcxxabi, libcxxrt, libunwind
···
47
47
48
48
patches = [
49
49
./gnu-install-dirs.patch
50
+
# See:
51
+
# - https://reviews.llvm.org/D133566
52
+
# - https://github.com/NixOS/nixpkgs/issues/214524#issuecomment-1429146432
53
+
# !!! Drop in LLVM 16+
54
+
(fetchpatch {
55
+
url = "https://github.com/llvm/llvm-project/commit/57c7bb3ec89565c68f858d316504668f9d214d59.patch";
56
+
hash = "sha256-AaM9A6tQ4YAw7uDqCIV4VaiUyLZv+unwcOqbakwW9/k=";
57
+
relative = "libcxx";
58
+
})
50
59
] ++ lib.optionals stdenv.hostPlatform.isMusl [
51
60
../../libcxx-0001-musl-hacks.patch
52
61
];
-1
pkgs/test/default.nix
-1
pkgs/test/default.nix
···
59
59
60
60
# libcxxStdenv broken
61
61
# fix in https://github.com/NixOS/nixpkgs/pull/216273
62
-
(filter (n: n != "llvmPackages_15"))
63
62
] ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
64
63
# libcxx does not build for some reason on aarch64-linux
65
64
(filter (n: n != "llvmPackages_7"))