Merge pull request #65537 from Holo-Host/201907/extend-static
pkgsStatic: override libunwind
This commit is contained in:
commit
554a789403
2 changed files with 6 additions and 2 deletions
|
@ -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";
|
||||
}
|
||||
|
|
|
@ -163,9 +163,11 @@ in {
|
|||
enableShared = false;
|
||||
inherit libcxxabi;
|
||||
};
|
||||
libunwind = super.llvmPackages_8.libraries.libunwind.override {
|
||||
enableShared = false;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
python27 = super.python27.override { static = true; };
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue