public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

boost: Do not force numpy support from 1.65 

The reason is that if cross compiling (or for other reasons) python
bindings as a whole are turned off. Those two lines then trigger
assertion errors unless manually overridden for cross compilation.

This way:

 1. The `enableNumpy` default respects the `enablePython deafult.
 2. Cross works by default
 3. Absurd manual overrides still break as they should
 4. The `>= 1.65` logic is direct and not a maintaince gotcha.
This commit is contained in:
Bojan Nikolic 2018-01-02 22:59:03 +00:00 committed by John Ericson
parent cb8349f59f
commit 00b038a3f8
3 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/boost/1.65.nix
View File

@ -9,6 +9,4 @@ callPackage ./generic.nix (args // rec {
sha256 = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81"; sha256 = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81";
}; };
enableNumpy = args.enableNumpy or true;
}) })

2
pkgs/development/libraries/boost/1.66.nix
View File

@ -9,6 +9,4 @@ callPackage ./generic.nix (args // rec {
sha256 = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9"; sha256 = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9";
}; };
enableNumpy = args.enableNumpy or true;
}) })

2
pkgs/development/libraries/boost/generic.nix
View File

@ -11,7 +11,7 @@
, enableShared ? !(hostPlatform.libc == "msvcrt") # problems for now , enableShared ? !(hostPlatform.libc == "msvcrt") # problems for now
, enableStatic ? !enableShared , enableStatic ? !enableShared
, enablePython ? hostPlatform == buildPlatform , enablePython ? hostPlatform == buildPlatform
, enableNumpy ? false , enableNumpy ? enablePython && stdenv.lib.versionAtLeast version "1.65"
, taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic)) , taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic))
, patches ? [] , patches ? []
, mpi ? null , mpi ? null