diff --git a/pkgs/by-name/di/dia/package.nix b/pkgs/by-name/di/dia/package.nix index 6331ed8b496b..fbb11047880d 100644 --- a/pkgs/by-name/di/dia/package.nix +++ b/pkgs/by-name/di/dia/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { [ graphene gtk3 - libxml2 + (libxml2.override { zlibSupport = true; }) python3 poppler ] diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 021d30a84346..7d17c038d16f 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -22,6 +22,8 @@ ), icuSupport ? false, icu, + zlibSupport ? false, + zlib, enableShared ? !stdenv.hostPlatform.isMinGW && !stdenv.hostPlatform.isStatic, enableStatic ? !enableShared, gnome, @@ -68,6 +70,9 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && pythonSupport && python ? isPy2 && python.isPy2) [ libintl + ] + ++ lib.optionals zlibSupport [ + zlib ]; propagatedBuildInputs = @@ -81,14 +86,18 @@ stdenv.mkDerivation (finalAttrs: { icu ]; - configureFlags = [ - "--exec-prefix=${placeholder "dev"}" - (lib.enableFeature enableStatic "static") - (lib.enableFeature enableShared "shared") - (lib.withFeature icuSupport "icu") - (lib.withFeature pythonSupport "python") - (lib.optionalString pythonSupport "PYTHON=${python.pythonOnBuildForHost.interpreter}") - ] ++ lib.optional enableHttp "--with-http"; + configureFlags = + [ + "--exec-prefix=${placeholder "dev"}" + (lib.enableFeature enableStatic "static") + (lib.enableFeature enableShared "shared") + (lib.withFeature icuSupport "icu") + (lib.withFeature pythonSupport "python") + (lib.optionalString pythonSupport "PYTHON=${python.pythonOnBuildForHost.interpreter}") + ] + # avoid rebuilds, can be merged into list in version bumps + ++ lib.optional enableHttp "--with-http" + ++ lib.optional zlibSupport "--with-zlib"; installFlags = lib.optionals pythonSupport [ "pythondir=\"${placeholder "py"}/${python.sitePackages}\""