mongodb: upgrade to 2.2.0

This commit is contained in:
Mathijs Kwik 2012-09-08 14:50:47 +02:00
parent d7f89b2075
commit 071d685dda
2 changed files with 13 additions and 20 deletions

View File

@ -1,39 +1,34 @@
{ stdenv, fetchurl, scons, which, boost, gnutar, v8 ? null, useV8 ? false}:
assert useV8 -> v8 != null;
{ stdenv, fetchurl, scons, which, v8, useV8 ? false}:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "mongodb-2.0.6";
name = "mongodb-2.2.0";
src = fetchurl {
url = "http://downloads.mongodb.org/src/mongodb-src-r2.0.6.tar.gz";
sha256 = "0kiiz8crx318sdn0wd9d88pzx9s1c6ak2dhd0zw7kl63gmd74wm9";
url = http://downloads.mongodb.org/src/mongodb-src-r2.2.0.tar.gz;
sha256 = "12v0cpq9j2gmagr9pbw08karqwqgl4j9r223w7x7sx5cfvj2cih8";
};
buildInputs = [scons which boost] ++ stdenv.lib.optional useV8 v8;
buildNativeInputs = [ scons which ];
enableParallelBuilding = true;
patchPhase = ''
substituteInPlace SConstruct --replace "Environment( MSVS_ARCH=msarch , tools = [\"default\", \"gch\"], toolpath = '.' )" "Environment( MSVS_ARCH=msarch , tools = [\"default\", \"gch\"], toolpath = '.', ENV = os.environ )"
substituteInPlace SConstruct --replace "../v8" "${v8}"
substituteInPlace SConstruct --replace "LIBPATH=[\"${v8}/\"]" "LIBPATH=[\"${v8}/lib\"]"
substituteInPlace SConstruct --replace "Environment( BUILD_DIR" "Environment( ENV = os.environ, BUILD_DIR"
'' + optionalString useV8 ''
substituteInPlace SConstruct --replace "#/../v8" "${v8}" \
--replace "[\"${v8}/\"]" "[\"${v8}/lib\"]"
'';
buildPhase = ''
export TERM=""
scons all --cc=`which gcc` --cxx=`which g++` --libpath=${boost}/lib --cpppath=${boost}/include \
${optionalString useV8 "--usev8"}
echo $PATH
scons all --cc=`which gcc` --cxx=`which g++` ${optionalString useV8 "--usev8"}
'';
installPhase = ''
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
scons install --cc=`which gcc` --cxx=`which g++` ${optionalString useV8 "--usev8"} --full --prefix=$out
rm -rf $out/lib64 # exact same files as installed in $out/lib
'';
meta = {
@ -45,4 +40,3 @@ stdenv.mkDerivation rec {
platforms = stdenv.lib.platforms.all;
};
}

View File

@ -5348,7 +5348,6 @@ let
#monetdb = callPackage ../servers/sql/monetdb { };
mongodb = callPackage ../servers/nosql/mongodb {
boost = boost149;
useV8 = (getConfig ["mongodb" "useV8"] false);
};