From cdee3b7966e52161c5ba086f2b5f4974be243b55 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Mon, 29 Jul 2019 03:04:05 +0300 Subject: llvmPackages_8.libraries.libunwind: add enableShared option --- pkgs/development/compilers/llvm/8/libunwind.nix | 4 +++- 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; }; - } -- cgit 1.4.1