diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-02-10 00:02:42 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-10 00:02:42 +0000 |
| commit | 1022c88f8b2a869c63eaa98faa1eaf918afd612e (patch) | |
| tree | 94374266bf0adaf09179766d8bf9f8e10303a30a /pkgs/tools/networking | |
| parent | 2e4a82010d2b975e196f08aa0bcc1f1288bf096b (diff) | |
| parent | dd62f5782976332caa53d5bcb993c3bd86d9b271 (diff) | |
| download | nixlib-1022c88f8b2a869c63eaa98faa1eaf918afd612e.tar nixlib-1022c88f8b2a869c63eaa98faa1eaf918afd612e.tar.gz nixlib-1022c88f8b2a869c63eaa98faa1eaf918afd612e.tar.bz2 nixlib-1022c88f8b2a869c63eaa98faa1eaf918afd612e.tar.lz nixlib-1022c88f8b2a869c63eaa98faa1eaf918afd612e.tar.xz nixlib-1022c88f8b2a869c63eaa98faa1eaf918afd612e.tar.zst nixlib-1022c88f8b2a869c63eaa98faa1eaf918afd612e.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/tools/networking')
| -rw-r--r-- | pkgs/tools/networking/curl/default.nix | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 9cbf6dc1b0fb..c2438f1b5777 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -33,6 +33,7 @@ , haskellPackages , ocamlPackages , phpExtensions +, pkgsStatic , python3 , tests , testers @@ -102,6 +103,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 = [ @@ -190,6 +196,7 @@ stdenv.mkDerivation (finalAttrs: { # nginx-http3 = useThisCurl nixosTests.nginx-http3; nginx-http3 = nixosTests.nginx-http3; pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + static = pkgsStatic.curl; } // lib.optionalAttrs (!stdenv.isDarwin) { fetchpatch = tests.fetchpatch.simple.override { fetchpatch = (fetchpatch.override { fetchurl = useThisCurl fetchurl; }) // { version = 1; }; }; }; |