From 28dff32e0e61ba611cc22f9992fca06dc1c55836 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Wed, 23 Oct 2024 21:04:11 -0500 Subject: [PATCH] libpsl: enable Windows builds Bringing python3 into the mix breaks Windows builds, which in turn prevents curl from building on Windows in the default configuration for nixpkgs. Excluding python3 from the buildInputs on Windows prevents that problem The rest of the changes are nixfmt changes --- pkgs/development/libraries/libpsl/default.nix | 38 +++++++++++-------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index 1659a55cb4ef..15a8cef8b49f 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -1,17 +1,19 @@ -{ lib, stdenv -, fetchurl -, autoreconfHook -, docbook_xsl -, docbook_xml_dtd_43 -, gtk-doc -, lzip -, libidn2 -, libunistring -, libxslt -, pkg-config -, python3 -, buildPackages -, publicsuffix-list +{ + lib, + stdenv, + fetchurl, + autoreconfHook, + docbook_xsl, + docbook_xml_dtd_43, + gtk-doc, + lzip, + libidn2, + libunistring, + libxslt, + pkg-config, + python3, + buildPackages, + publicsuffix-list, }: stdenv.mkDerivation rec { @@ -23,7 +25,11 @@ stdenv.mkDerivation rec { hash = "sha256-mp9qjG7bplDPnqVUdc0XLdKEhzFoBOnHMgLZdXLNOi0="; }; - outputs = [ "out" "dev" ] + outputs = + [ + "out" + "dev" + ] # bin/psl-make-dafsa brings a large runtime closure through python3 ++ lib.optional (!stdenv.hostPlatform.isStatic) "bin"; @@ -41,7 +47,7 @@ stdenv.mkDerivation rec { libidn2 libunistring libxslt - ] ++ lib.optional (!stdenv.hostPlatform.isStatic) python3; + ] ++ lib.optional (!stdenv.hostPlatform.isStatic && !stdenv.hostPlatform.isWindows) python3; propagatedBuildInputs = [ publicsuffix-list