JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #149100 from Mic92/libunwind

Browse Source 
libunwind: cross-fixes
This commit is contained in:
Jörg Thalheim 2021-12-07 14:45:45 +00:00 committed by GitHub
commit 764c3c51c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/libunwind/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, fetchpatch, autoreconfHook, xz, coreutils }: { stdenv, lib, fetchurl, fetchpatch, autoreconfHook, xz, buildPackages }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libunwind"; pname = "libunwind";
@ -19,7 +19,9 @@ stdenv.mkDerivation rec {
}) })
]; ];
postPatch = lib.optionalString stdenv.hostPlatform.isMusl '' postPatch = if stdenv.cc.isClang then ''
substituteInPlace configure.ac --replace "-lgcc_s" ""
'' else lib.optionalString stdenv.hostPlatform.isMusl ''
substituteInPlace configure.ac --replace "-lgcc_s" "-lgcc_eh" substituteInPlace configure.ac --replace "-lgcc_s" "-lgcc_eh"
''; '';
@ -29,7 +31,7 @@ stdenv.mkDerivation rec {
# Without latex2man, no man pages are installed despite being # Without latex2man, no man pages are installed despite being
# prebuilt in the source tarball. # prebuilt in the source tarball.
configureFlags = [ "LATEX2MAN=${coreutils}/bin/true" ]; configureFlags = [ "LATEX2MAN=${buildPackages.coreutils}/bin/true" ];
propagatedBuildInputs = [ xz ]; propagatedBuildInputs = [ xz ];