gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

haskellPackages.postgresql-libpq-pkgconfig: use libpq v17 in pkgsStatic

Browse Source 
The libpq build in pkgsStatic has been fixed on staging in
9f3bea8dca.
This commit is contained in:
Wolfgang Walther
2025-04-06 11:35:21 +02:00
parent ae9206cad9
commit 2ec5fbd5f2
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/haskell-modules/configuration-nix.nix
+1 -10
View File
@@ -1654,16 +1654,7 @@ builtins.intersectAttrs super {
librarySystemDepends = (drv.librarySystemDepends or [ ]) ++ [ pkgs.libpq ];
}) super.postgresql-libpq-configure;
postgresql-libpq-pkgconfig =
addPkgconfigDepend
# Building postgresql-libpq with PG17 in pkgsStatic works fine, but downstream can't link against it with:
# > /nix/store/7ir63m9sbqzflf3yfynn45i109w6a5iz-x86_64-unknown-linux-musl-binutils-2.43.1/bin/x86_64-unknown-linux-musl-ld:
# /nix/store/vj7fwxbyvs15zrjbb9vafxbwmc05hl70-postgresql-static-x86_64-unknown-linux-musl-17.2-dev/lib/libpq.a(fe-connect.o):
# in function `PQsetClientEncoding':
# > (.text.PQsetClientEncoding+0xdf): undefined reference to `pg_encoding_to_char'
# Falling back to v16 to work around it.
(if pkgs.stdenv.hostPlatform.isStatic then pkgs.postgresql_16 else pkgs.libpq)
super.postgresql-libpq-pkgconfig;
postgresql-libpq-pkgconfig = addPkgconfigDepend pkgs.libpq super.postgresql-libpq-pkgconfig;
# Test failure is related to a GHC implementation detail of primitives and doesn't
# cause actual problems in dependent packages, see https://github.com/lehins/pvar/issues/4