git.iko.soy/typeable/nixpkgs
on master help sign in
Bump cudatoolkit in pycuda derivation, remove boost dependency
commitcf5dcbf49f8fa97cb5a1f02a9c3ff224ec392228 authorMichael Lingelbach <m.j.lbach@gmail.com> dateSun 17 May 2020, 12:43 (7 years ago) parent4b4e2b3
2 files changed+4−4
pkgs/development/python-modules/pycuda/default.nix+3−3 pkgs/top-level/python-packages.nix+1−1
pkgs/development/python-modules/pycuda/default.nix+3−3
@@ -13,7 +13,6 @@
1313, python
1414, mkDerivation
1515, stdenv
16−, isPy3k
1716}:
1817let
1918 compyte = import ./compyte.nix {
@@ -29,11 +28,12 @@ buildPythonPackage rec {
2928 sha256 = "ada56ce98a41f9f95fe18809f38afbae473a5c62d346cfa126a2d5477f24cc8a";
3029 };
3130
32− preConfigure = ''
31+ preConfigure = with stdenv.lib.versions; ''
3332 ${python.interpreter} configure.py --boost-inc-dir=${boost.dev}/include \
3433 --boost-lib-dir=${boost}/lib \
3534 --no-use-shipped-boost \
36− --boost-python-libname=boost_python${stdenv.lib.optionalString isPy3k "3"}
35+ --boost-python-libname=boost_python${major python.version}${minor python.version} \
36+ --cuda-root=${cudatoolkit}
3737 '';
3838
3939 postInstall = ''
pkgs/top-level/python-packages.nix+1−1
@@ -3268,7 +3268,7 @@ in {
32683268 pycares = callPackage ../development/python-modules/pycares { };
32693269
32703270 pycuda = callPackage ../development/python-modules/pycuda {
3271− cudatoolkit = pkgs.cudatoolkit_7_5;
3271+ cudatoolkit = pkgs.cudatoolkit;
32723272 inherit (pkgs.stdenv) mkDerivation;
32733273 };
32743274