mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-17 07:13:23 +01:00
mongodb: pick python version from scons
The python modules that we to the enviroment should always come from the same python version as scons as otherwise they can't be loaded. This unbreaks the build of mongodb 4.2 which pinned python to 3.8 while our python attribute moved on to 3.9 which is what scons uses now.
This commit is contained in:
parent
218df5159c
commit
cd20497c66
1 changed files with 3 additions and 4 deletions
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, fetchurl, sconsPackages, boost, gperftools, pcre-cpp, snappy, zlib, libyamlcpp
|
||||
, sasl, openssl, libpcap, python27, python38, curl, Security, CoreFoundation, cctools }:
|
||||
, sasl, openssl, libpcap, curl, Security, CoreFoundation, cctools }:
|
||||
|
||||
# Note:
|
||||
# The command line tools are written in Go as part of a different package (mongodb-tools)
|
||||
|
@ -12,17 +12,16 @@ with lib;
|
|||
|
||||
let
|
||||
variants = if versionAtLeast version "4.2"
|
||||
then { python = python38.withPackages (ps: with ps; [ pyyaml cheetah3 psutil setuptools ]);
|
||||
then rec { python = scons.python.withPackages (ps: with ps; [ pyyaml cheetah3 psutil setuptools ]);
|
||||
scons = sconsPackages.scons_latest;
|
||||
mozjsVersion = "60";
|
||||
mozjsReplace = "defined(HAVE___SINCOS)";
|
||||
}
|
||||
else { python = python27.withPackages (ps: with ps; [ pyyaml typing cheetah ]);
|
||||
else rec { python = scons.python.withPackages (ps: with ps; [ pyyaml typing cheetah ]);
|
||||
scons = sconsPackages.scons_3_1_2;
|
||||
mozjsVersion = "45";
|
||||
mozjsReplace = "defined(HAVE_SINCOS)";
|
||||
};
|
||||
python = python27.withPackages (ps: with ps; [ pyyaml typing cheetah ]);
|
||||
system-libraries = [
|
||||
"boost"
|
||||
"pcre"
|
||||
|
|
Loading…
Reference in a new issue