From feabbe8bc4e0d5b0390c823ee58206d20d05d52e Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Wed, 19 Jun 2024 20:15:09 -0700 Subject: [PATCH] libpsl: make python both a build and runtime dependency Previously, python3 was only provided as a nativeBuildInput. However, libpsl.bin distributes python scripts. To make them use the right python, provide python as a buildInput and specify which python to use at build time with a configure flag. --- pkgs/development/libraries/libpsl/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index a8fcd2581caa..2a8e1ae24abb 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -10,6 +10,7 @@ , libxslt , pkg-config , python3 +, buildPackages , valgrind , publicsuffix-list }: @@ -33,7 +34,6 @@ stdenv.mkDerivation rec { gtk-doc lzip pkg-config - python3 libxslt ]; @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { libidn2 libunistring libxslt + python3 ]; propagatedBuildInputs = [ @@ -61,6 +62,7 @@ stdenv.mkDerivation rec { "--with-psl-distfile=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat" "--with-psl-file=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat" "--with-psl-testfile=${publicsuffix-list}/share/publicsuffix/test_psl.txt" + "PYTHON=${lib.getExe buildPackages.python3}" ]; enableParallelBuilding = true;