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
This commit is contained in:
Shea Levy 2014-03-14 19:52:43 -04:00
commit 6da2d89016

View file

@ -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" ];