Skip to content

pkgsStatic.curl: fix build #287515

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mweinelt merged 2 commits into from
Feb 9, 2024
Merged

pkgsStatic.curl: fix build #287515

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ae0827
pkgsStatic.curl: fix build
alyssais Feb 9, 2024
817d201
curl.tests.static: init
alyssais Feb 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions pkgs/tools/networking/curl/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
, haskellPackages
, ocamlPackages
, phpExtensions
, pkgsStatic
, python3
, tests
, testers
Expand Down Expand Up @@ -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 = [
Expand Down Expand Up @@ -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; }; };
};
Expand Down