Commit 28dff32e authored by Greg Hellings's avatar Greg Hellings
Browse files

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
parent eee954a4

pkgs/development/libraries/libpsl/default.nix

+22 −16
Original line number Diff line number Diff line 
{ 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