about summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2024-02-09 17:05:19 +0100
committerAlyssa Ross <hi@alyssa.is>2024-02-09 17:05:19 +0100
commit4ae0827699ae0b3b412b5683bddb23d251b529c9 (patch)
tree0af39f7aa579f8864cda78082020601c65ffb59e /pkgs/tools
parentb38903da74d4fa07bd7045e89bb31e6d4cc13548 (diff)
downloadnixlib-4ae0827699ae0b3b412b5683bddb23d251b529c9.tar
nixlib-4ae0827699ae0b3b412b5683bddb23d251b529c9.tar.gz
nixlib-4ae0827699ae0b3b412b5683bddb23d251b529c9.tar.bz2
nixlib-4ae0827699ae0b3b412b5683bddb23d251b529c9.tar.lz
nixlib-4ae0827699ae0b3b412b5683bddb23d251b529c9.tar.xz
nixlib-4ae0827699ae0b3b412b5683bddb23d251b529c9.tar.zst
nixlib-4ae0827699ae0b3b412b5683bddb23d251b529c9.zip
pkgsStatic.curl: fix build
Link: https://github.com/NixOS/nixpkgs/pull/285295#issuecomment-1935911944
Fixes: 996b4ebc08e5 ("curl: build with public suffix list support")
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/networking/curl/default.nix5
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 9cbf6dc1b0fb..41cac913f608 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -102,6 +102,11 @@ stdenv.mkDerivation (finalAttrs: {
   preConfigure = ''
     sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure
     rm src/tool_hugehelp.c
+  '' + lib.optionalString (pslSupport && stdenv.hostPlatform.isStatic) ''
+    # curl doesn't understand that libpsl2 has deps because it doesn't use
+    # pkg-config.
+    # https://github.com/curl/curl/pull/12919
+    configureFlagsArray+=("LIBS=-lidn2 -lunistring")
   '';
 
   configureFlags = [