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

Merge pull request #65537 from Holo-Host/201907/extend-static

Browse Source 
pkgsStatic: override libunwind
This commit is contained in:
Matthew Bauer 2019-08-13 12:47:03 -04:00 committed by GitHub
commit 554a789403
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/llvm/8/libunwind.nix
View File

@ -1,4 +1,4 @@
{ stdenv, version, fetch, cmake, fetchpatch }: { stdenv, version, fetch, cmake, fetchpatch, enableShared ? true }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "libunwind-${version}"; name = "libunwind-${version}";
@ -19,4 +19,6 @@ stdenv.mkDerivation {
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;
cmakeFlags = stdenv.lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF";
} }

4
pkgs/top-level/static.nix
View File

@ -163,9 +163,11 @@ in {
enableShared = false; enableShared = false;
inherit libcxxabi; inherit libcxxabi;
}; };
libunwind = super.llvmPackages_8.libraries.libunwind.override {
enableShared = false;
};
}; };
}; };
python27 = super.python27.override { static = true; }; python27 = super.python27.override { static = true; };
} }