diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index ac9e807801c..33e1f8505d2 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -108,14 +108,13 @@ rec { } // {inherit fetchurl;}; - # Return a modified stdenv that disables building shared libraries. - # However, executables will still be dynamically linked. - disableSharedLibraries = stdenv: stdenv // + # Return a modified stdenv that enables building static libraries. + enableStaticLibraries = stdenv: stdenv // { mkDerivation = args: stdenv.mkDerivation (args // { dontDisableStatic = true; configureFlags = (if args ? configureFlags then args.configureFlags else "") - + " --disable-shared"; # brrr... + + " --enable-static"; }); } // {inherit fetchurl;}; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 100e07f0152..82f269fd00b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4220,7 +4220,7 @@ let }; libjpegStatic = lowPrio (appendToName "static" (libjpeg.override { - stdenv = disableSharedLibraries stdenv; + stdenv = enableStaticLibraries stdenv; })); libksba = import ../development/libraries/libksba {