diff options
| author | Tristan Carel <tristan.carel@epfl.ch> | 2017-12-07 15:32:07 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-12-12 21:02:32 +0100 |
| commit | 19dbfb66c0d66692bbd121937f42e28842578e20 (patch) | |
| tree | 1aaf64b6da00780e9c122c9235b605793e3becb9 /pkgs/development/libraries/boost | |
| parent | a1471bbe85d251cee39ecbacbb95ba942b1454a2 (diff) | |
| download | nixpkgs-19dbfb66c0d66692bbd121937f42e28842578e20.tar nixpkgs-19dbfb66c0d66692bbd121937f42e28842578e20.tar.gz nixpkgs-19dbfb66c0d66692bbd121937f42e28842578e20.tar.bz2 nixpkgs-19dbfb66c0d66692bbd121937f42e28842578e20.tar.lz nixpkgs-19dbfb66c0d66692bbd121937f42e28842578e20.tar.xz nixpkgs-19dbfb66c0d66692bbd121937f42e28842578e20.tar.zst nixpkgs-19dbfb66c0d66692bbd121937f42e28842578e20.zip | |
boost: build Python numpy extension by default
In order to manipulate Python arrays numpy is needed from boost 1.65 on. http://www.boost.org/users/history/version_1_65_1.html
Diffstat (limited to 'pkgs/development/libraries/boost')
| -rw-r--r-- | pkgs/development/libraries/boost/1.65.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/boost/generic.nix | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/libraries/boost/1.65.nix b/pkgs/development/libraries/boost/1.65.nix index 9837e1c6919..56b136cd99b 100644 --- a/pkgs/development/libraries/boost/1.65.nix +++ b/pkgs/development/libraries/boost/1.65.nix @@ -9,4 +9,6 @@ callPackage ./generic.nix (args // rec { sha256 = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81"; }; + enableNumpy = true; + }) diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 3c954bdd147..b2ec31ace17 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -10,7 +10,7 @@ , enablePIC ? false , enableExceptions ? false , enablePython ? hostPlatform == buildPlatform -, enableNumpy ? false, numpy ? null +, enableNumpy ? false , taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic)) , patches ? null , mpi ? null @@ -156,7 +156,7 @@ stdenv.mkDerivation { ++ optional (hostPlatform == buildPlatform) icu ++ optional stdenv.isDarwin fixDarwinDylibNames ++ optional enablePython python - ++ optional enableNumpy numpy; + ++ optional enableNumpy python.pkgs.numpy; configureScript = "./bootstrap.sh"; configureFlags = commonConfigureFlags |