diff options
| author | Benjamin Hipple <bhipple@protonmail.com> | 2020-05-17 21:16:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-17 21:16:13 -0400 |
| commit | f648016c0bc3173c26620de8c4271f6e435f0e34 (patch) | |
| tree | c63874412d6378d2591b58a54acef8ee1a8a1bf0 /pkgs | |
| parent | 1003df398306083e79277a5c3348038c056049dd (diff) | |
| parent | cf5dcbf49f8fa97cb5a1f02a9c3ff224ec392228 (diff) | |
| download | nixlib-f648016c0bc3173c26620de8c4271f6e435f0e34.tar nixlib-f648016c0bc3173c26620de8c4271f6e435f0e34.tar.gz nixlib-f648016c0bc3173c26620de8c4271f6e435f0e34.tar.bz2 nixlib-f648016c0bc3173c26620de8c4271f6e435f0e34.tar.lz nixlib-f648016c0bc3173c26620de8c4271f6e435f0e34.tar.xz nixlib-f648016c0bc3173c26620de8c4271f6e435f0e34.tar.zst nixlib-f648016c0bc3173c26620de8c4271f6e435f0e34.zip | |
Merge pull request #88031 from mjlbach/unbreak_pycuda
Pycuda: bump cudatoolkit dependency, fix boost, fix build
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/python-modules/pycuda/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/python-modules/pycuda/default.nix b/pkgs/development/python-modules/pycuda/default.nix index a03662aa961d..b9a75734b8e4 100644 --- a/pkgs/development/python-modules/pycuda/default.nix +++ b/pkgs/development/python-modules/pycuda/default.nix @@ -13,7 +13,6 @@ , python , mkDerivation , stdenv -, isPy3k }: let compyte = import ./compyte.nix { @@ -29,11 +28,12 @@ buildPythonPackage rec { sha256 = "ada56ce98a41f9f95fe18809f38afbae473a5c62d346cfa126a2d5477f24cc8a"; }; - preConfigure = '' + preConfigure = with stdenv.lib.versions; '' ${python.interpreter} configure.py --boost-inc-dir=${boost.dev}/include \ --boost-lib-dir=${boost}/lib \ --no-use-shipped-boost \ - --boost-python-libname=boost_python${stdenv.lib.optionalString isPy3k "3"} + --boost-python-libname=boost_python${major python.version}${minor python.version} \ + --cuda-root=${cudatoolkit} ''; postInstall = '' diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c7c14cc95cf7..6c798eddbadc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3268,7 +3268,7 @@ in { pycares = callPackage ../development/python-modules/pycares { }; pycuda = callPackage ../development/python-modules/pycuda { - cudatoolkit = pkgs.cudatoolkit_7_5; + cudatoolkit = pkgs.cudatoolkit; inherit (pkgs.stdenv) mkDerivation; }; |