Skip to content

Fix #2365 missing pg_config #2366

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
merged 3 commits into from
May 21, 2025
+8 −4
Merged

Fix #2365 missing pg_config #2366

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2112a50
Fix #2365 missing pg_config
hamishmack May 21, 2025
79d2b7b
Add comment
hamishmack May 21, 2025
582ed1f
Merge remote-tracking branch 'origin/master' into hkm/fix-pg_config
hamishmack May 21, 2025
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
12 changes: 8 additions & 4 deletions lib/system-nixpkgs-map.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ let
lndir ${pkgs.buildPackages.gcc.cc} $out
'')
] else [];
# In newer versions of nixpkgs `pg_config` has been moved to its own derivation.
# Haskell libs that depend on the `pq` library (like `postgresql-libpq`)
# are likely to require `pg_config` to be in the `PATH` as well.
postgresqlLibs = [ postgresql ] ++ lib.optional (postgresql ? pg_config) postgresql.pg_config;
in
# -- linux
{ crypto = [ openssl ];
Expand Down Expand Up @@ -57,10 +61,10 @@ in
bz2 = [ bzip2 ];
util = [ utillinux ];
magic = [ file ];
pgcommon = [ postgresql ];
pgport = [ postgresql] ;
pq = [ postgresql ];
libpq = [ postgresql ];
pgcommon = postgresqlLibs;
pgport = postgresqlLibs;
pq = postgresqlLibs;
libpq = postgresqlLibs;
iconv = [ libiconv ];
lapack = [ liblapack ];
boost_atomic = [ boost ];
Expand Down