diff options
| author | Yegor Timoshenko <yegortimoshenko@transumption.com> | 2019-07-29 03:04:05 +0300 |
|---|---|---|
| committer | Yegor Timoshenko <yegortimoshenko@transumption.com> | 2019-07-29 03:08:02 +0300 |
| commit | cdee3b7966e52161c5ba086f2b5f4974be243b55 (patch) | |
| tree | 1f316c47dc8a77ad3f141e22ada296dabc9d2188 | |
| parent | 239fffc90d792b5362a20ec1a009978de7b8f91a (diff) | |
| download | nixpkgs-cdee3b7966e52161c5ba086f2b5f4974be243b55.tar nixpkgs-cdee3b7966e52161c5ba086f2b5f4974be243b55.tar.gz nixpkgs-cdee3b7966e52161c5ba086f2b5f4974be243b55.tar.bz2 nixpkgs-cdee3b7966e52161c5ba086f2b5f4974be243b55.tar.lz nixpkgs-cdee3b7966e52161c5ba086f2b5f4974be243b55.tar.xz nixpkgs-cdee3b7966e52161c5ba086f2b5f4974be243b55.tar.zst nixpkgs-cdee3b7966e52161c5ba086f2b5f4974be243b55.zip | |
llvmPackages_8.libraries.libunwind: add enableShared option
| -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 a4ceb9102ef..747de229890 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 476ad9de3e9..d69c69bd8a7 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -154,9 +154,11 @@ in { enableShared = false; inherit libcxxabi; }; + libunwind = super.llvmPackages_8.libraries.libunwind.override { + enableShared = false; + }; }; }; python27 = super.python27.override { static = true; }; - } |