Skip to content

Commit 3bf6a06

Browse files
authored
Merge: postgresqlPackages: fix some builds on darwin (#354748)
2 parents f11b5ff + 4801d0c commit 3bf6a06

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

pkgs/servers/sql/postgresql/ext/system_stats.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
1717
hash = "sha256-/xXnui0S0ZjRw7P8kMAgttHVv8T41aOhM3pM8P0OTig=";
1818
};
1919

20+
buildFlags = [ "PG_CFLAGS=-Wno-error=vla" ];
21+
2022
installPhase = ''
2123
runHook preInstall
2224

pkgs/servers/sql/postgresql/generic.nix

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,12 @@ let
165165
src = ./patches/locale-binary-path.patch;
166166
locale = "${if stdenv.hostPlatform.isDarwin then darwin.adv_cmds else lib.getBin stdenv.cc.libc}/bin/locale";
167167
})
168+
] ++ lib.optionals (stdenv'.hostPlatform.isDarwin && atLeast "17") [
169+
# TODO: Remove this with the next set of minor releases
170+
(fetchpatch ({
171+
url = "https://github.com/postgres/postgres/commit/0a883a067bd78f0ff0607afb18c4f783ac764504.patch";
172+
hash = "sha256-F3zCaar6w6bwQDno7Tkg7ZbPJ+rhgi8/2NSvFakzQek=";
173+
}))
168174
] ++ lib.optionals (olderThan "17") [
169175
# TODO: Remove this with the next set of minor releases
170176
(fetchpatch (

0 commit comments

Comments
 (0)