mkl: extract static libraries optionally

This commit is contained in:
Roberto Di Remigio
2019-12-19 10:12:00 +01:00
parent e0605b3174
commit 6cc9bbe2fd
2 changed files with 25 additions and 20 deletions
+5 -4
View File
@@ -55,7 +55,7 @@ self: super: let
removeUnknownConfigureFlags = f: with self.lib;
remove "--disable-shared"
(remove "--enable-static" f);
ocamlFixPackage = b:
b.overrideAttrs (o: {
configurePlatforms = [ ];
@@ -63,7 +63,7 @@ self: super: let
buildInputs = o.buildInputs ++ o.nativeBuildInputs or [ ];
propagatedNativeBuildInputs = o.propagatedBuildInputs or [ ];
});
ocamlStaticAdapter = _: super:
self.lib.mapAttrs
(_: p: if p ? overrideAttrs then ocamlFixPackage p else p)
@@ -153,6 +153,7 @@ in {
static = true;
};
openblas = super.openblas.override { enableStatic = true; };
mkl = super.mkl.override { enableStatic = true; };
nix = super.nix.override { withAWS = false; };
# openssl 1.1 doesn't compile
openssl = super.openssl_1_0_2.override {
@@ -209,7 +210,7 @@ in {
kmod = super.kmod.override {
withStatic = true;
};
curl = super.curl.override {
# a very sad story: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=439039
gssSupport = false;
@@ -241,6 +242,6 @@ in {
ocaml-ng = self.lib.mapAttrs (_: set:
if set ? overrideScope' then set.overrideScope' ocamlStaticAdapter else set
) super.ocaml-ng;
python27 = super.python27.override { static = true; };
}