diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-06-18 18:01:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-18 18:01:10 +0000 |
| commit | 10a7b09af825757f3a1936a4e0e5f321a248c651 (patch) | |
| tree | 46f0dd1c0369147f6e74ec4dd2e83e112d0ce393 /pkgs/development/ruby-modules | |
| parent | 0237218125bfe441eec5a2e2e91b3d55ee1bd13b (diff) | |
| parent | 8bcef0a5fe11140aa4c29fcffd6eb35c601f8ca4 (diff) | |
| download | nixpkgs-10a7b09af825757f3a1936a4e0e5f321a248c651.tar nixpkgs-10a7b09af825757f3a1936a4e0e5f321a248c651.tar.gz nixpkgs-10a7b09af825757f3a1936a4e0e5f321a248c651.tar.bz2 nixpkgs-10a7b09af825757f3a1936a4e0e5f321a248c651.tar.lz nixpkgs-10a7b09af825757f3a1936a4e0e5f321a248c651.tar.xz nixpkgs-10a7b09af825757f3a1936a4e0e5f321a248c651.tar.zst nixpkgs-10a7b09af825757f3a1936a4e0e5f321a248c651.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/ruby-modules')
| -rw-r--r-- | pkgs/development/ruby-modules/gem-config/default.nix | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 22794da2516..a9eb1f96ab8 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -573,9 +573,14 @@ in }; pg = attrs: { - buildFlags = [ - "--with-pg-config=${postgresql}/bin/pg_config" - ]; + # Force pkg-config lookup for libpq. + # See https://github.com/ged/ruby-pg/blob/6629dec6656f7ca27619e4675b45225d9e422112/ext/extconf.rb#L34-L55 + # + # Note that setting --with-pg-config=${postgresql}/bin/pg_config would add + # an unnecessary reference to the entire postgresql package. + buildFlags = [ "--with-pg-config=ignore" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ postgresql ]; }; psych = attrs: { |