From 51ec873c8dae8e5bbb040954cf9422c64769d36e Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 11 Jun 2012 17:41:14 +0000 Subject: [PATCH] mongodb: upgraded to 2.0.6 svn path=/nixpkgs/trunk/; revision=34470 --- pkgs/servers/nosql/mongodb/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index 85b949ef12c..685aeb05ce7 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -2,12 +2,14 @@ assert useV8 -> v8 != null; +with stdenv.lib; + stdenv.mkDerivation rec { - name = "mongodb-2.0.5"; + name = "mongodb-2.0.6"; src = fetchurl { - url = "http://downloads.mongodb.org/src/mongodb-src-r2.0.5.tar.gz"; - sha256 = "0vnwphjn0iqgjrvfk18vridx5324zmmbrapp2d9rbqc9xg6jrpav"; + url = "http://downloads.mongodb.org/src/mongodb-src-r2.0.6.tar.gz"; + sha256 = "0kiiz8crx318sdn0wd9d88pzx9s1c6ak2dhd0zw7kl63gmd74wm9"; }; buildInputs = [scons which boost] ++ stdenv.lib.optional useV8 v8; @@ -22,11 +24,13 @@ stdenv.mkDerivation rec { buildPhase = '' export TERM="" - scons all --cc=`which gcc` --cxx=`which g++` --libpath=${boost}/lib --cpppath=${boost}/include ${if useV8 then "--usev8" else ""} + scons all --cc=`which gcc` --cxx=`which g++` --libpath=${boost}/lib --cpppath=${boost}/include \ + ${optionalString useV8 "--usev8"} ''; installPhase = '' - scons install --cc=`which gcc` --cxx=`which g++` --libpath=${boost}/lib --cpppath=${boost}/include --full --prefix=$out + scons install --cc=`which gcc` --cxx=`which g++` --libpath=${boost}/lib --cpppath=${boost}/include \ + ${optionalString useV8 "--usev8"} --full --prefix=$out if [ -d $out/lib64 ]; then mv $out/lib64 $out/lib fi