Commit f6086df4 authored by Will Fancher's avatar Will Fancher
Browse files

mongodb: Eliminate 'variants' redundancy.

parent f29d66a7

pkgs/servers/nosql/mongodb/mongodb.nix

+14 −30
Original line number Diff line number Diff line
@@ -32,14 +32,12 @@ with lib; 
}:



let

  variants =

    if versionAtLeast version "6.0"

    then rec {

  python = scons.python.withPackages (ps: with ps; [

    pyyaml

    cheetah3

    psutil

    setuptools

  ] ++ lib.optionals (versionAtLeast version "6.0") [

    packaging

    pymongo

  ]);
@@ -47,20 +45,6 @@ let 
  mozjsVersion = "60";

  mozjsReplace = "defined(HAVE___SINCOS)";



    }

    else rec {

      python = scons.python.withPackages (ps: with ps; [

        pyyaml

        cheetah3

        psutil

        setuptools

      ]);



      mozjsVersion = "60";

      mozjsReplace = "defined(HAVE___SINCOS)";



    };



  system-libraries = [

    "boost"

    "pcre"
@@ -95,7 +79,7 @@ in stdenv.mkDerivation rec { 
    openssl

    openldap

    pcre-cpp

    variants.python

    python

    sasl

    snappy

    zlib
@@ -123,7 +107,7 @@ in stdenv.mkDerivation rec { 
    # remove -march overriding, we know better.

    sed -i 's/env.Append.*-march=.*$/pass/' SConstruct

  '' + lib.optionalString (stdenv.isDarwin && versionOlder version "6.0") ''

    substituteInPlace src/third_party/mozjs-${variants.mozjsVersion}/extract/js/src/jsmath.cpp --replace '${variants.mozjsReplace}' 0

    substituteInPlace src/third_party/mozjs-${mozjsVersion}/extract/js/src/jsmath.cpp --replace '${mozjsReplace}' 0

  '' + lib.optionalString (stdenv.isDarwin && versionOlder version "3.6") ''

    substituteInPlace src/third_party/s2/s1angle.cc --replace drem remainder

    substituteInPlace src/third_party/s2/s1interval.cc --replace drem remainder