Skip to content

Commit 2112a50

Browse files
committed
Fix #2365 missing pg_config
The `pg_config` executable was moved into its own derivation in `nixpkgs`. This fix includes that derivation if present when the `pg` library is requested.
1 parent e7397dd commit 2112a50

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

lib/system-nixpkgs-map.nix

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ let
1717
lndir ${pkgs.buildPackages.gcc.cc} $out
1818
'')
1919
] else [];
20+
postgresqlLibs = [ postgresql ] ++ lib.optional (postgresql ? pg_config) postgresql.pg_config;
2021
in
2122
# -- linux
2223
{ crypto = [ openssl ];
@@ -57,10 +58,10 @@ in
5758
bz2 = [ bzip2 ];
5859
util = [ utillinux ];
5960
magic = [ file ];
60-
pgcommon = [ postgresql ];
61-
pgport = [ postgresql] ;
62-
pq = [ postgresql ];
63-
libpq = [ postgresql ];
61+
pgcommon = postgresqlLibs;
62+
pgport = postgresqlLibs;
63+
pq = postgresqlLibs;
64+
libpq = postgresqlLibs;
6465
iconv = [ libiconv ];
6566
lapack = [ liblapack ];
6667
boost_atomic = [ boost ];

0 commit comments

Comments
 (0)