From e8682cafd6106ff33a589fc644fa5294a86b14c0 Mon Sep 17 00:00:00 2001 From: Ding Xiang Fei Date: Mon, 30 Jul 2018 11:54:57 +0800 Subject: [PATCH] always build against tzdata --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index bbb5a5a1774eb3..a81e2fb2c8ff16 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -30,10 +30,10 @@ let "--with-libxml" "--sysconfdir=/etc" "--libdir=$(lib)/lib" + "--with-system-tzdata=${tzdata}" ] ++ lib.optional stdenv.isDarwin "--with-uuid=e2fs" - ++ lib.optional (!stdenv.isDarwin) "--with-ossp-uuid" - ++ lib.optional stdenv.isCross "--with-system-tzdata=${tzdata}"; + ++ lib.optional (!stdenv.isDarwin) "--with-ossp-uuid"; patches = [ (if atLeast "9.4" then ./disable-resolve_symlinks-94.patch else ./disable-resolve_symlinks.patch)