Unverified Commit 3bf6a063 authored by Maximilian Bosch's avatar Maximilian Bosch Committed by GitHub
Browse files

Merge: postgresqlPackages: fix some builds on darwin (#354748)

parents f11b5ff8 4801d0c2

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

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec { 
    hash = "sha256-/xXnui0S0ZjRw7P8kMAgttHVv8T41aOhM3pM8P0OTig=";

  };



  buildFlags = [ "PG_CFLAGS=-Wno-error=vla" ];



  installPhase = ''

    runHook preInstall

pkgs/servers/sql/postgresql/generic.nix

+6 −0
Original line number Diff line number Diff line
@@ -165,6 +165,12 @@ let 
        src = ./patches/locale-binary-path.patch;

        locale = "${if stdenv.hostPlatform.isDarwin then darwin.adv_cmds else lib.getBin stdenv.cc.libc}/bin/locale";

      })

    ] ++ lib.optionals (stdenv'.hostPlatform.isDarwin && atLeast "17") [

      # TODO: Remove this with the next set of minor releases

      (fetchpatch ({

        url = "https://github.com/postgres/postgres/commit/0a883a067bd78f0ff0607afb18c4f783ac764504.patch";

        hash = "sha256-F3zCaar6w6bwQDno7Tkg7ZbPJ+rhgi8/2NSvFakzQek=";

      }))

    ] ++ lib.optionals (olderThan "17") [

      # TODO: Remove this with the next set of minor releases

      (fetchpatch (