Sam/nix closure shrink

nix/ext/hypopg.nix

@@ -4,7 +4,8 @@ stdenv.mkDerivation rec {
   pname = "hypopg";
   version = "1.4.1";
 
-  buildInputs = [ postgresql ];
+  nativeBuildInputs = [ postgresql ];
+  buildInputs = [ postgresql.lib ];
 
   src = fetchFromGitHub {
     owner = "HypoPG";

nix/ext/index_advisor.nix

@@ -4,7 +4,8 @@ stdenv.mkDerivation rec {
   pname = "index_advisor";
   version = "0.2.0";
 
-  buildInputs = [ postgresql ];
+  nativeBuildInputs = [ postgresql ];
+  buildInputs = [ postgresql.lib ];
 
   src = fetchFromGitHub {
     owner = "olirice";

nix/ext/pg-safeupdate.nix

@@ -4,7 +4,8 @@ stdenv.mkDerivation rec {
   pname = "pg-safeupdate";
   version = "1.4";
 
-  buildInputs = [ postgresql ];
+  nativeBuildInputs = [ postgresql ];
+  buildInputs = [ postgresql.lib ];
 
   src = fetchFromGitHub {
     owner  = "eradman";

nix/ext/pg_backtrace.nix

@@ -4,7 +4,8 @@ stdenv.mkDerivation rec {
   pname = "pg_backtrace";
   version = "1.1";
 
-  buildInputs = [ postgresql ];
+  nativeBuildInputs = [ postgresql ];
+  buildInputs = [ postgresql.lib ];
 
   src = fetchFromGitHub {
     owner  = "pashkinelfe";

nix/ext/pg_cron.nix

@@ -4,7 +4,8 @@ stdenv.mkDerivation rec {
   pname = "pg_cron";
   version = "1.6.4";
 
-  buildInputs = [ postgresql ];
+  nativeBuildInputs = [ postgresql ];
+  buildInputs = [ postgresql.lib ];
 
   src = fetchFromGitHub {
     owner  = "citusdata";

nix/ext/pg_graphql.nix

@@ -12,8 +12,8 @@ buildPgrxExtension_0_11_3 rec {
     hash = "sha256-Q6XfcTKVOjo5pGy8QACc4QCHolKxEGU8e0TTC6Zg8go=";
   };
 
-  nativeBuildInputs = [ cargo ];
-  buildInputs = [ postgresql ];
+  nativeBuildInputs = [ cargo postgresql ];
+  buildInputs = [ postgresql.lib ];
 
   CARGO="${cargo}/bin/cargo";
   #darwin env needs PGPORT to be unique for build to not clash with other pgrx extensions

nix/ext/pg_hashids.nix

@@ -4,7 +4,8 @@ stdenv.mkDerivation rec {
   pname = "pg_hashids";
   version = "cd0e1b31d52b394a0df64079406a14a4f7387cd6";
 
-  buildInputs = [ postgresql ];
+  nativeBuildInputs = [ postgresql ];
+  buildInputs = [ postgresql.lib ];
 
   src = fetchFromGitHub {
     owner = "iCyberon";

nix/ext/pg_jsonschema.nix

@@ -12,8 +12,8 @@ buildPgrxExtension_0_11_3 rec {
     hash = "sha256-YdKpOEiDIz60xE7C+EzpYjBcH0HabnDbtZl23CYls6g=";
   };
 
-  nativeBuildInputs = [ cargo ];
-  buildInputs = [ postgresql ];
+  nativeBuildInputs = [ cargo postgresql];
+  buildInputs = [ postgresql.lib ];
   # update the following array when the pg_jsonschema version is updated
   # required to ensure that extensions update scripts from previous versions are generated
 

nix/ext/pg_net.nix

@@ -4,7 +4,8 @@ stdenv.mkDerivation rec {
   pname = "pg_net";
   version = "0.10.0";
 
-  buildInputs = [ curl postgresql ];
+  nativeBuildInputs = [ postgresql ];
+  buildInputs = [ curl postgresql.lib ];
 
   src = fetchFromGitHub {
     owner = "supabase";

nix/ext/pg_plan_filter.nix

@@ -4,7 +4,8 @@ stdenv.mkDerivation rec {
   pname = "pg_plan_filter";
   version = "5081a7b5cb890876e67d8e7486b6a64c38c9a492";
 
-  buildInputs = [ postgresql ];
+  nativeBuildInputs = [ postgresql ];
+  buildInputs = [ postgresql.lib ];
 
   src = fetchFromGitHub {
     owner = "pgexperts";

nix/ext/pg_stat_monitor.nix

@@ -19,7 +19,8 @@ stdenv.mkDerivation rec {
   pname = "pg_stat_monitor";
   version = "1.1.1";
 
-  buildInputs = [ postgresql ];
+  nativeBuildInputs = [ postgresql ];
+  buildInputs = [ postgresql.lib ];
 
   src = fetchFromGitHub {
     owner = "percona";

nix/ext/pg_tle.nix

@@ -4,8 +4,8 @@ stdenv.mkDerivation rec {
   pname = "pg_tle";
   version = "1.4.0";
 
-  nativeBuildInputs = [ flex ];
-  buildInputs = [ openssl postgresql libkrb5 ];
+  nativeBuildInputs = [ flex openssl postgresql libkrb5 ];
+  buildInputs = [ postgresql.lib ];
 
   src = fetchFromGitHub {
     owner = "aws";

nix/ext/pgaudit.nix

@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
     hash = "sha256-8pShPr4HJaJQPjW1iPJIpj3CutTx8Tgr+rOqoXtgCcw=";
   };
 
-  buildInputs = [ libkrb5 openssl postgresql ];
+  nativeBuildInputs = [ libkrb5 openssl postgresql ];
+  buildInputs = [ postgresql.lib ];
 
   makeFlags = [ "USE_PGXS=1" ];
 

nix/ext/pgroonga.nix

@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
     url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz";
     sha256 = "sha256-iF/zh4zDDpAw5fxW1WG8i2bfPt4VYsnYArwOoE/lwgM=";
   };
-  nativeBuildInputs = [ pkg-config makeWrapper ];
-  buildInputs = [ postgresql msgpack-c supabase-groonga mecab ];
+  nativeBuildInputs = [ pkg-config makeWrapper postgresql];
+  buildInputs = [ postgresql.lib msgpack-c supabase-groonga mecab ];
   propagatedBuildInputs = [ supabase-groonga ];
   configureFlags = [
     "--with-mecab=${mecab}"

nix/ext/pgrouting.nix

@@ -4,8 +4,8 @@ stdenv.mkDerivation rec {
   pname = "pgrouting";
   version = "3.4.1";
 
-  nativeBuildInputs = [ cmake perl ];
-  buildInputs = [ postgresql boost ];
+  nativeBuildInputs = [ cmake perl postgresql ];
+  buildInputs = [ postgresql.lib boost ];
 
   src = fetchFromGitHub {
     owner  = "pgRouting";

nix/ext/pgsodium.nix

@@ -4,7 +4,8 @@ stdenv.mkDerivation rec {
   pname = "pgsodium";
   version = "3.1.8";
 
-  buildInputs = [ libsodium postgresql ];
+  nativeBuildInputs = [ postgresql ];
+  buildInputs = [ libsodium postgresql.lib ];
 
   src = fetchFromGitHub {
     owner = "michelp";

nix/ext/pgsql-http.nix

@@ -4,7 +4,8 @@ stdenv.mkDerivation rec {
   pname = "pgsql-http";
   version = "1.5.0";
 
-  buildInputs = [ curl postgresql ];
+  nativeBuildInputs = [  postgresql ];
+  buildInputs = [ curl postgresql.lib ];
 
   src = fetchFromGitHub {
     owner = "pramsey";

nix/ext/pgvector.nix

@@ -4,7 +4,8 @@ stdenv.mkDerivation rec {
   pname = "pgvector";
   version = "0.7.4";
 
-  buildInputs = [ postgresql ];
+  nativeBuildInputs = [ postgresql ];
+  buildInputs = [ postgresql.lib ];
 
   src = fetchFromGitHub {
     owner = "pgvector";

nix/ext/plpgsql-check.nix

@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
     hash = "sha256-vR3MvfmUP2QEAtXFpq0NCCKck3wZPD+H3QleHtyVQJs=";
   };
 
-  buildInputs = [ postgresql ];
+  nativeBuildInputs = [ postgresql ];
+  buildInputs = [ postgresql.lib ];
 
   installPhase = ''
     install -D -t $out/lib *${postgresql.dlSuffix}

nix/ext/plv8.nix

@@ -31,6 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     perl
+    postgresql
   ] ++ lib.optionals stdenv.isDarwin [
     clang
     xcbuild
@@ -40,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
     (v8.overrideAttrs (oldAttrs: {
       version = "9.7.106.18";  
     }))
-    postgresql
+    postgresql.lib
   ] ++ lib.optionals stdenv.isDarwin [
     darwin.apple_sdk.frameworks.CoreFoundation
     darwin.apple_sdk.frameworks.Kerberos

nix/ext/rum.nix

@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
     hash = "sha256-yy2xeDnk3fENN+En0st4mv60nZlqPafIzwf68jwJ5fE=";
   };
 
-  buildInputs = [ postgresql ];
+  nativeBuildInputs = [ postgresql ];
+  buildInputs = [ postgresql.lib ];
 
   makeFlags = [ "USE_PGXS=1" ];
 

nix/ext/supautils.nix

@@ -4,7 +4,8 @@ stdenv.mkDerivation rec {
   pname = "supautils";
   version = "2.2.1";
 
-  buildInputs = [ postgresql ];
+  nativeBuildInputs = [ postgresql ];
+  buildInputs = [ postgresql.lib ];
 
   src = fetchFromGitHub {
     owner = "supabase";

nix/ext/timescaledb.nix

@@ -4,8 +4,8 @@ stdenv.mkDerivation rec {
   pname = "timescaledb${lib.optionalString (!enableUnfree) "-apache"}";
   version = "2.9.1";
 
-  nativeBuildInputs = [ cmake ];
-  buildInputs = [ postgresql openssl libkrb5 ];
+  nativeBuildInputs = [ cmake postgresql ];
+  buildInputs = [ postgresql.lib openssl libkrb5 ];
 
   src = fetchFromGitHub {
     owner = "timescale";

nix/ext/vault.nix

@@ -4,7 +4,8 @@ stdenv.mkDerivation rec {
   pname = "vault";
   version = "0.2.9";
 
-  buildInputs = [ postgresql ];
+  nativeBuildInputs = [ postgresql ];
+  buildInputs = [ postgresql.lib ];
 
   src = fetchFromGitHub {
     owner = "supabase";

nix/ext/wal2json.nix

@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
     hash = "sha256-Gpc9uDKrs/dmVSFgdgHM453+TaEnhRh9t0gDbSn8FUI=";
   };
 
-  buildInputs = [ postgresql ];
+  nativeBuildInputs = [ postgresql ];
+  buildInputs = [ postgresql.lib ];
 
   makeFlags = [ "USE_PGXS=1" ];