From 8ff27f6602c1fcbddbb327fde36460efa01d1dc8 Mon Sep 17 00:00:00 2001
From: Steve Purcell <steve@sanityinc.com>
Date: Wed, 22 Mar 2023 15:55:06 +0100
Subject: [PATCH 1/4] libpg_query: also build shared library

---
 pkgs/development/libraries/libpg_query/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libpg_query/default.nix b/pkgs/development/libraries/libpg_query/default.nix
index 95d615c5d24..cf0fcc45475 100644
--- a/pkgs/development/libraries/libpg_query/default.nix
+++ b/pkgs/development/libraries/libpg_query/default.nix
@@ -13,11 +13,15 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ which ];
 
-  makeFlags = [ "build" ];
+  makeFlags = [ "build" "build_shared" ];
 
   installPhase = ''
     install -Dm644 -t $out/lib libpg_query.a
     install -Dm644 -t $out/include pg_query.h
+  '' + lib.optionalString stdenv.isLinux ''
+    install -Dm644 -t $out/lib libpg_query.so
+  '' + lib.optionalString stdenv.isDarwin ''
+    install -Dm644 -t $out/lib libpg_query.dylib
   '';
 
   meta = with lib; {

From f6957645b54171ddbc400629490ba68dcb80acd4 Mon Sep 17 00:00:00 2001
From: Steve Purcell <steve@sanityinc.com>
Date: Mon, 27 Mar 2023 13:25:44 +0200
Subject: [PATCH 2/4] libpg_query: enable tests

---
 pkgs/development/libraries/libpg_query/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/libraries/libpg_query/default.nix b/pkgs/development/libraries/libpg_query/default.nix
index cf0fcc45475..b34de163292 100644
--- a/pkgs/development/libraries/libpg_query/default.nix
+++ b/pkgs/development/libraries/libpg_query/default.nix
@@ -24,6 +24,11 @@ stdenv.mkDerivation rec {
     install -Dm644 -t $out/lib libpg_query.dylib
   '';
 
+  doCheck = true;
+  checkPhase = ''
+    make test
+  '';
+
   meta = with lib; {
     homepage = "https://github.com/pganalyze/libpg_query";
     description = "C library for accessing the PostgreSQL parser outside of the server environment";

From 79fe155d0584502884738096a8d1f94646d722b3 Mon Sep 17 00:00:00 2001
From: Steve Purcell <steve@sanityinc.com>
Date: Thu, 30 Mar 2023 11:58:01 +0200
Subject: [PATCH 3/4] libpg_query: prefer setting checkTarget to overriding
 checkPhase

---
 pkgs/development/libraries/libpg_query/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libpg_query/default.nix b/pkgs/development/libraries/libpg_query/default.nix
index b34de163292..59801a029cf 100644
--- a/pkgs/development/libraries/libpg_query/default.nix
+++ b/pkgs/development/libraries/libpg_query/default.nix
@@ -25,9 +25,7 @@ stdenv.mkDerivation rec {
   '';
 
   doCheck = true;
-  checkPhase = ''
-    make test
-  '';
+  checkTarget = "test";
 
   meta = with lib; {
     homepage = "https://github.com/pganalyze/libpg_query";

From 0c355fe2d1736bf1b910f42a1490836bec1b038e Mon Sep 17 00:00:00 2001
From: Steve Purcell <steve@sanityinc.com>
Date: Fri, 7 Apr 2023 10:44:22 +0200
Subject: [PATCH 4/4] libpg_query: avoid hard-coding dynamic library file
 extensions

---
 pkgs/development/libraries/libpg_query/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libpg_query/default.nix b/pkgs/development/libraries/libpg_query/default.nix
index 59801a029cf..1335eb3579d 100644
--- a/pkgs/development/libraries/libpg_query/default.nix
+++ b/pkgs/development/libraries/libpg_query/default.nix
@@ -18,10 +18,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     install -Dm644 -t $out/lib libpg_query.a
     install -Dm644 -t $out/include pg_query.h
-  '' + lib.optionalString stdenv.isLinux ''
-    install -Dm644 -t $out/lib libpg_query.so
-  '' + lib.optionalString stdenv.isDarwin ''
-    install -Dm644 -t $out/lib libpg_query.dylib
+    install -Dm644 -t $out/lib libpg_query${stdenv.hostPlatform.extensions.sharedLibrary}
   '';
 
   doCheck = true;