public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into staging

Browse Source
This commit is contained in:
Tuomas Tynkkynen
2018-08-04 15:17:42 +03:00
parent 7a337cde31 20f1388c3f
commit 008fd5fcf5
132 changed files with 6166 additions and 2582 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/servers/sql/postgresql/default.nix
View File

@@ -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)