pyrox.dev
lol
Merge #137497: libunwind: upstream fix for -fno-common
... into staging
+10
-2
+10
-2
pkgs/development/libraries/libunwind/default.nix
+10
-2
pkgs/development/libraries/libunwind/default.nix
···
1
-
{ stdenv, lib, fetchurl, autoreconfHook, xz, coreutils }:
1
+
{ stdenv, lib, fetchurl, fetchpatch, autoreconfHook, xz, coreutils }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "libunwind";
···
9
9
sha256 = "0dc46flppifrv2z0mrdqi60165ghxm1wk0g47vcbyzjdplqwjnfz";
10
10
};
11
11
12
-
patches = [ ./backtrace-only-with-glibc.patch ];
12
+
patches = [
13
+
./backtrace-only-with-glibc.patch
14
+
15
+
(fetchpatch {
16
+
# upstream build fix against -fno-common compilers like >=gcc-10
17
+
url = "https://github.com/libunwind/libunwind/commit/29e17d8d2ccbca07c423e3089a6d5ae8a1c9cb6e.patch";
18
+
sha256 = "1angwfq6h0jskg6zx8g6w9min38g5mgmrcbppcy5hqn59cgsxbw0";
19
+
})
20
+
];
13
21
14
22
postPatch = lib.optionalString stdenv.hostPlatform.isMusl ''
15
23
substituteInPlace configure.ac --replace "-lgcc_s" "-lgcc_eh"