Skip to content

Commit bc7155d

Browse files
authored
feat: make sure to source debug and src from our build (#1246)
Co-authored-by: Sam Rose <[email protected]>
1 parent 074a2ec commit bc7155d

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

flake.nix

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@
6969
(import ./nix/overlays/cargo-pgrx-0-11-3.nix)
7070
];
7171
};
72-
postgresql_15 = pkgs.postgresql.postgresql_15;
7372
sfcgal = pkgs.callPackage ./nix/ext/sfcgal/sfcgal.nix { };
7473
supabase-groonga = pkgs.callPackage ./nix/supabase-groonga.nix { };
7574
mecab-naist-jdic = pkgs.callPackage ./nix/ext/mecab-naist-jdic/default.nix { };
@@ -305,7 +304,7 @@
305304
pkgs.callPackage ./nix/ext/pg_regress.nix {
306305
postgresql = postgresqlPackage;
307306
};
308-
307+
postgresql_15 = getPostgresqlPackage "15";
309308
in
310309
postgresVersions //{
311310
supabase-groonga = supabase-groonga;
@@ -314,13 +313,13 @@
314313
#psql_orioledb_16 = makeOrioleDbPostgres "16_23" postgresql_orioledb_16;
315314
sfcgal = sfcgal;
316315
pg_prove = pkgs.perlPackages.TAPParserSourceHandlerpgTAP;
317-
postgresql_15 = pkgs.postgresql_15;
318-
316+
inherit postgresql_15;
317+
postgresql_15_debug = if pkgs.stdenv.isLinux then postgresql_15.debug else null;
319318
postgresql_15_src = pkgs.stdenv.mkDerivation {
320319
pname = "postgresql-15-src";
321-
version = pkgs.postgresql_15.version;
320+
version = postgresql_15.version;
322321

323-
src = pkgs.postgresql_15.src;
322+
src = postgresql_15.src;
324323

325324
nativeBuildInputs = [ pkgs.bzip2 ];
326325

0 commit comments

Comments
 (0)