diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-08-04 15:17:42 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-08-04 15:17:42 +0300 |
| commit | 008fd5fcf5f45c6478ccd3d52ec923052eccb932 (patch) | |
| tree | 14d454f88bd0f02fe550ba5b68d987573e8820fc /pkgs/servers/sql | |
| parent | 7a337cde318020a0f91702bfefee85a7b31be06f (diff) | |
| parent | 20f1388c3fb7c1c56367fd96fd21cfd316f465b7 (diff) | |
| download | nixlib-008fd5fcf5f45c6478ccd3d52ec923052eccb932.tar nixlib-008fd5fcf5f45c6478ccd3d52ec923052eccb932.tar.gz nixlib-008fd5fcf5f45c6478ccd3d52ec923052eccb932.tar.bz2 nixlib-008fd5fcf5f45c6478ccd3d52ec923052eccb932.tar.lz nixlib-008fd5fcf5f45c6478ccd3d52ec923052eccb932.tar.xz nixlib-008fd5fcf5f45c6478ccd3d52ec923052eccb932.tar.zst nixlib-008fd5fcf5f45c6478ccd3d52ec923052eccb932.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/servers/sql')
| -rw-r--r-- | pkgs/servers/sql/postgresql/default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index a727b60dd9d4..4eb8d717309d 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, glibc, fetchurl, zlib, readline, libossp_uuid, openssl, libxml2, makeWrapper }: +{ lib, stdenv, glibc, fetchurl, zlib, readline, libossp_uuid, openssl, libxml2, makeWrapper, tzdata }: let @@ -22,14 +22,16 @@ let makeFlags = [ "world" ]; + NIX_CFLAGS_COMPILE = [ "-I${libxml2.dev}/include/libxml2" ]; + configureFlags = [ "--with-openssl" "--with-libxml" "--sysconfdir=/etc" "--libdir=$(lib)/lib" - ] - ++ lib.optional (stdenv.isDarwin) "--with-uuid=e2fs" - ++ lib.optional (!stdenv.isDarwin) "--with-ossp-uuid"; + "--with-system-tzdata=${tzdata}" + (if stdenv.isDarwin then "--with-uuid=e2fs" else "--with-ossp-uuid") + ]; patches = [ (if atLeast "9.4" then ./disable-resolve_symlinks-94.patch else ./disable-resolve_symlinks.patch) |