diff options
| -rw-r--r-- | pkgs/development/interpreters/php/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/gdal/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/ruby-modules/gem-config/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/sql/postgresql/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/tools/backup/bacula/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/networking/kea/default.nix | 2 |
6 files changed, 13 insertions, 11 deletions
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 7b832fa6eed7..ed018a942273 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -99,12 +99,12 @@ let }; postgresql = { - configureFlags = ["--with-pgsql=${postgresql.dev}"]; + configureFlags = ["--with-pgsql=${postgresql}"]; buildInputs = [ postgresql ]; }; pdo_pgsql = { - configureFlags = ["--with-pdo-pgsql=${postgresql.dev}"]; + configureFlags = ["--with-pdo-pgsql=${postgresql}"]; buildInputs = [ postgresql ]; }; diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 600e9314cd4c..984d3da81198 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { "--with-png=${libpng.dev}" # optional "--with-poppler=${poppler.dev}" # optional "--with-libz=${zlib.dev}" # optional - "--with-pg=${postgresql.dev}/bin/pg_config" + "--with-pg=${postgresql}/bin/pg_config" "--with-mysql=${mysql.lib.dev}/bin/mysql_config" "--with-geotiff=${libgeotiff}" "--with-sqlite3=${sqlite.dev}" diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index a0d4b9adcbe3..6647d71bd006 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -183,7 +183,7 @@ in pg = attrs: { buildFlags = [ - "--with-pg-config=${postgresql.dev}/bin/pg_config" + "--with-pg-config=${postgresql}/bin/pg_config" ]; }; diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 980ed5056a11..8a3097ae9dee 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -11,7 +11,7 @@ let inherit sha256; }; - outputs = [ "out" "dev" "lib" "doc" "man" ]; + outputs = [ "out" "lib" "doc" "man" ]; setOutputFlags = false; # $out retains configureFlags :-/ buildInputs = @@ -46,16 +46,18 @@ let let path = if atLeast "9.6" then "src/common/config_info.c" else "src/bin/pg_config/pg_config.c"; in '' # Hardcode the path to pgxs so pg_config returns the path in $out - substituteInPlace "${path}" --replace HARDCODED_PGXS_PATH $dev/lib + substituteInPlace "${path}" --replace HARDCODED_PGXS_PATH $out/lib ''; postInstall = '' - moveToOutput "bin/pg_config" "$dev" - moveToOutput "lib/pgxs" "$dev" # looks strange, but not deleting it + moveToOutput "lib/pgxs" "$out" # looks strange, but not deleting it moveToOutput "lib/*.a" "$out" moveToOutput "lib/libecpg*" "$out" + # Prevent a retained dependency on gcc-wrapper. + substituteInPlace "$out/lib/pgxs/src/Makefile.global" --replace ${stdenv.cc}/bin/ld ld + # Remove static libraries in case dynamic are available. for i in $out/lib/*.a; do name="$(basename "$i")" diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix index 7c368ce4d039..374122814c50 100644 --- a/pkgs/tools/backup/bacula/default.nix +++ b/pkgs/tools/backup/bacula/default.nix @@ -12,9 +12,9 @@ stdenv.mkDerivation rec { # acl relies on attr, which I can't get to build on darwin ++ stdenv.lib.optional (!stdenv.isDarwin) acl; - configureFlags = [ + configureFlags = [ "--with-sqlite3=${sqlite.dev}" - "--with-postgresql=${postgresql.dev}" + "--with-postgresql=${postgresql}" ]; postInstall = '' diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix index cd4c45121692..e1829bcaf7d8 100644 --- a/pkgs/tools/networking/kea/default.nix +++ b/pkgs/tools/networking/kea/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--localstatedir=/var" "--with-botan-config=${botan}/bin/botan-config-1.10" - "--with-dhcp-pgsql=${postgresql.dev}/bin/pg_config" + "--with-dhcp-pgsql=${postgresql}/bin/pg_config" "--with-dhcp-mysql=${mysql.client.dev}/bin/mysql_config" ]; |