bzip2: Add enableStatic
. See #61575
This commit is contained in:
parent
011075578a
commit
e73b7f8d63
@ -29,7 +29,7 @@ in rec {
|
|||||||
cctools_ = darwin.cctools;
|
cctools_ = darwin.cctools;
|
||||||
|
|
||||||
# Avoid debugging larger changes for now.
|
# Avoid debugging larger changes for now.
|
||||||
bzip2_ = bzip2.override (args: { linkStatic = true; });
|
bzip2_ = bzip2.override (args: { enableStatic = true; enableShared = false; });
|
||||||
|
|
||||||
# Avoid messing with libkrb5 and libnghttp2.
|
# Avoid messing with libkrb5 and libnghttp2.
|
||||||
curl_ = curlMinimal.override (args: { gssSupport = false; http2Support = false; });
|
curl_ = curlMinimal.override (args: { gssSupport = false; http2Support = false; });
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
{ lib, stdenv, fetchurl
|
{ lib, stdenv, fetchurl
|
||||||
, linkStatic ? with stdenv.hostPlatform; isStatic || isCygwin
|
, enableStatic ? with stdenv.hostPlatform; isStatic || isCygwin
|
||||||
|
, enableShared ? true
|
||||||
, autoreconfHook
|
, autoreconfHook
|
||||||
, testers
|
, testers
|
||||||
}:
|
}:
|
||||||
@ -47,8 +48,12 @@ in {
|
|||||||
|
|
||||||
outputs = [ "bin" "dev" "out" "man" ];
|
outputs = [ "bin" "dev" "out" "man" ];
|
||||||
|
|
||||||
configureFlags =
|
configureFlags = lib.concatLists [
|
||||||
lib.optionals linkStatic [ "--enable-static" "--disable-shared" ];
|
(lib.optional enableStatic "--enable-static")
|
||||||
|
(lib.optional (!enableShared) "--disable-shared")
|
||||||
|
];
|
||||||
|
|
||||||
|
dontDisableStatic = enableStatic;
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user