diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-08-13 12:47:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-13 12:47:03 -0400 |
| commit | 554a789403efbbeb8d096b6b77b7db2f8e5b7e08 (patch) | |
| tree | 78916104597af406a3223322808a4db15dc5b802 | |
| parent | bf1cf3d52012d0b0b340ce50745e800bba7a818f (diff) | |
| parent | cdee3b7966e52161c5ba086f2b5f4974be243b55 (diff) | |
Merge pull request #65537 from Holo-Host/201907/extend-static
pkgsStatic: override libunwind
| -rw-r--r-- | pkgs/development/compilers/llvm/8/libunwind.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/static.nix | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/development/compilers/llvm/8/libunwind.nix b/pkgs/development/compilers/llvm/8/libunwind.nix index 648320028536..75edd1fff54d 100644 --- a/pkgs/development/compilers/llvm/8/libunwind.nix +++ b/pkgs/development/compilers/llvm/8/libunwind.nix @@ -1,4 +1,4 @@ -{ stdenv, version, fetch, cmake, fetchpatch }: +{ stdenv, version, fetch, cmake, fetchpatch, enableShared ? true }: stdenv.mkDerivation { name = "libunwind-${version}"; @@ -19,4 +19,6 @@ stdenv.mkDerivation { ]; enableParallelBuilding = true; + + cmakeFlags = stdenv.lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF"; } diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index 108c6006fb64..eac84cfc1a8d 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -163,9 +163,11 @@ in { enableShared = false; inherit libcxxabi; }; + libunwind = super.llvmPackages_8.libraries.libunwind.override { + enableShared = false; + }; }; }; python27 = super.python27.override { static = true; }; - } |