diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-06-30 23:58:07 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-06-30 23:58:07 -0700 |
| commit | 612f0bdd679e16bd05397c85de9ea4b147cb45dc (patch) | |
| tree | 68f50e65ea610c52a60ab9bb3b6fe27006db368d /pkgs/servers/sql | |
| parent | 857efa12fb54a05674406fafcdc43b0576d17eb2 (diff) | |
| parent | ddf15bc78a869ec61487aa20edd4e8d9ba044519 (diff) | |
| download | nixlib-612f0bdd679e16bd05397c85de9ea4b147cb45dc.tar nixlib-612f0bdd679e16bd05397c85de9ea4b147cb45dc.tar.gz nixlib-612f0bdd679e16bd05397c85de9ea4b147cb45dc.tar.bz2 nixlib-612f0bdd679e16bd05397c85de9ea4b147cb45dc.tar.lz nixlib-612f0bdd679e16bd05397c85de9ea4b147cb45dc.tar.xz nixlib-612f0bdd679e16bd05397c85de9ea4b147cb45dc.tar.zst nixlib-612f0bdd679e16bd05397c85de9ea4b147cb45dc.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/servers/sql')
| -rw-r--r-- | pkgs/servers/sql/postgresql/9.4.x.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/servers/sql/postgresql/9.4.x.nix b/pkgs/servers/sql/postgresql/9.4.x.nix index 5c795329b2d4..cdb689fc110b 100644 --- a/pkgs/servers/sql/postgresql/9.4.x.nix +++ b/pkgs/servers/sql/postgresql/9.4.x.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { makeFlags = [ "world" ]; configureFlags = [ "--with-openssl" ] + ++ optional (stdenv.isDarwin) "--with-uuid=e2fs" ++ optional (!stdenv.isDarwin) "--with-ossp-uuid"; patches = [ ./disable-resolve_symlinks-94.patch ./less-is-more.patch ]; |