From f27f203f5a4d71af2058019ea4e22cfa1037d6b7 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 17 Sep 2024 21:55:48 +0200 Subject: [PATCH] postgresqlPackages: use makeFlags USE_PGXS=1 consistently --- pkgs/servers/sql/postgresql/ext/pg_similarity.nix | 4 +++- pkgs/servers/sql/postgresql/ext/plr.nix | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix index 20e5299da25a..a0669331055b 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix @@ -12,7 +12,9 @@ stdenv.mkDerivation { }; buildInputs = [ postgresql gcc ]; - buildPhase = "USE_PGXS=1 make"; + + makeFlags = [ "USE_PGXS=1" ]; + installPhase = '' install -D pg_similarity${postgresql.dlSuffix} -t $out/lib/ install -D ./{pg_similarity--unpackaged--1.0.sql,pg_similarity--1.0.sql,pg_similarity.control} -t $out/share/postgresql/extension diff --git a/pkgs/servers/sql/postgresql/ext/plr.nix b/pkgs/servers/sql/postgresql/ext/plr.nix index 1800b424716f..05d22c19a8b0 100644 --- a/pkgs/servers/sql/postgresql/ext/plr.nix +++ b/pkgs/servers/sql/postgresql/ext/plr.nix @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ R postgresql ]; - preBuild = '' - export USE_PGXS=1 - ''; + + makeFlags = [ "USE_PGXS=1" ]; + installPhase = '' install -D plr${postgresql.dlSuffix} -t $out/lib/ install -D {plr--*.sql,plr.control} -t $out/share/postgresql/extension