libpsl: backport pkg-config static fix

This was merged 9 months ago, and still no release, so let's backport
it, because the alternative is adding the same hack as curl in other
packages, like libsoup.
This commit is contained in:
Alyssa Ross
2025-02-08 12:30:14 +01:00
parent 212aaa22fb
commit 9040833b3f
2 changed files with 11 additions and 5 deletions
-5
View File
@@ -123,11 +123,6 @@ 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 = [
+11
View File
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchurl,
fetchpatch,
autoreconfHook,
docbook_xsl,
docbook_xml_dtd_43,
@@ -25,6 +26,16 @@ stdenv.mkDerivation rec {
hash = "sha256-mp9qjG7bplDPnqVUdc0XLdKEhzFoBOnHMgLZdXLNOi0=";
};
patches = [
# Can be dropped on next release, or if we switch to Meson for
# this package. Test pkgsStatic.curl still builds.
(fetchpatch {
name = "static.patch";
url = "https://github.com/rockdaboot/libpsl/commit/490bd6f98a2addcade55028ea60c36cce07e21e4.patch";
hash = "sha256-7Uu9gaVuA9Aly2mmnhUVgv2BYQTSBODJ2rDl5xp0uVY=";
})
];
outputs =
[
"out"