lol

bzip2: Add `enableStatic`. See #61575

+9 -4
+1 -1
pkgs/stdenv/darwin/make-bootstrap-tools.nix
··· 29 29 cctools_ = darwin.cctools; 30 30 31 31 # Avoid debugging larger changes for now. 32 - bzip2_ = bzip2.override (args: { linkStatic = true; }); 32 + bzip2_ = bzip2.override (args: { enableStatic = true; enableShared = false; }); 33 33 34 34 # Avoid messing with libkrb5 and libnghttp2. 35 35 curl_ = curlMinimal.override (args: { gssSupport = false; http2Support = false; });
+8 -3
pkgs/tools/compression/bzip2/default.nix
··· 1 1 { lib, stdenv, fetchurl 2 - , linkStatic ? with stdenv.hostPlatform; isStatic || isCygwin 2 + , enableStatic ? with stdenv.hostPlatform; isStatic || isCygwin 3 + , enableShared ? true 3 4 , autoreconfHook 4 5 , testers 5 6 }: ··· 47 48 48 49 outputs = [ "bin" "dev" "out" "man" ]; 49 50 50 - configureFlags = 51 - lib.optionals linkStatic [ "--enable-static" "--disable-shared" ]; 51 + configureFlags = lib.concatLists [ 52 + (lib.optional enableStatic "--enable-static") 53 + (lib.optional (!enableShared) "--disable-shared") 54 + ]; 55 + 56 + dontDisableStatic = enableStatic; 52 57 53 58 enableParallelBuilding = true; 54 59