diff options
author | Shea Levy <shea@shealevy.com> | 2014-03-14 19:52:43 -0400 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2014-03-14 19:52:43 -0400 |
commit | 6da2d89016d54c9025f751e5d237d21f28797ab0 (patch) | |
tree | e9ecd84a05ed379ecff652cfde6bd99aea2833c7 /pkgs/servers | |
parent | 5a38bfdb9cc75ebd27b594460bf4be70d2f970f9 (diff) | |
parent | 91c9027691d7e70ecca20b7cc94cf90f2097db79 (diff) | |
download | nixlib-6da2d89016d54c9025f751e5d237d21f28797ab0.tar nixlib-6da2d89016d54c9025f751e5d237d21f28797ab0.tar.gz nixlib-6da2d89016d54c9025f751e5d237d21f28797ab0.tar.bz2 nixlib-6da2d89016d54c9025f751e5d237d21f28797ab0.tar.lz nixlib-6da2d89016d54c9025f751e5d237d21f28797ab0.tar.xz nixlib-6da2d89016d54c9025f751e5d237d21f28797ab0.tar.zst nixlib-6da2d89016d54c9025f751e5d237d21f28797ab0.zip |
Merge branch 'postgresql93-ossp-uuid-clean' of git://github.com/basvandijk/nixpkgs
Configure postgresql-9.3 with support for the ossp-uuid module Conflicts: pkgs/servers/sql/postgresql/9.3.x.nix
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/sql/postgresql/9.3.x.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/servers/sql/postgresql/9.3.x.nix b/pkgs/servers/sql/postgresql/9.3.x.nix index 7f6e2d25d187..3b5c820c94d1 100644 --- a/pkgs/servers/sql/postgresql/9.3.x.nix +++ b/pkgs/servers/sql/postgresql/9.3.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, readline }: +{ stdenv, fetchurl, zlib, readline, libossp_uuid }: let version = "9.3.3"; in @@ -10,12 +10,17 @@ stdenv.mkDerivation rec { sha256 = "e925d8abe7157bd8bece6b7c0dd0c343d87a2b4336f85f4681ce596af99c3879"; }; - buildInputs = [ zlib readline ]; + buildInputs = [ zlib readline libossp_uuid ]; enableParallelBuilding = true; makeFlags = [ "world" ]; + configureFlags = + '' + --with-ossp-uuid + ''; + patches = [ ./disable-resolve_symlinks.patch ./less-is-more.patch ]; installTargets = [ "install-world" ]; |