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

Merge pull request #88031 from mjlbach/unbreak_pycuda 

Pycuda: bump cudatoolkit dependency, fix boost, fix build
This commit is contained in:
Benjamin Hipple 2020-05-17 21:16:13 -04:00 committed by GitHub
parent 1003df3983 cf5dcbf49f
commit f648016c0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/python-modules/pycuda/default.nix
View File

@ -13,7 +13,6 @@
, python , python
, mkDerivation , mkDerivation
, stdenv , stdenv
, isPy3k
}: }:
let let
compyte = import ./compyte.nix { compyte = import ./compyte.nix {
@ -29,11 +28,12 @@ buildPythonPackage rec {
sha256 = "ada56ce98a41f9f95fe18809f38afbae473a5c62d346cfa126a2d5477f24cc8a"; sha256 = "ada56ce98a41f9f95fe18809f38afbae473a5c62d346cfa126a2d5477f24cc8a";
}; };
preConfigure = '' preConfigure = with stdenv.lib.versions; ''
${python.interpreter} configure.py --boost-inc-dir=${boost.dev}/include \ ${python.interpreter} configure.py --boost-inc-dir=${boost.dev}/include \
--boost-lib-dir=${boost}/lib \ --boost-lib-dir=${boost}/lib \
--no-use-shipped-boost \ --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 = '' postInstall = ''

2
pkgs/top-level/python-packages.nix
View File

@ -3268,7 +3268,7 @@ in {
pycares = callPackage ../development/python-modules/pycares { }; pycares = callPackage ../development/python-modules/pycares { };
pycuda = callPackage ../development/python-modules/pycuda { pycuda = callPackage ../development/python-modules/pycuda {
cudatoolkit = pkgs.cudatoolkit_7_5; cudatoolkit = pkgs.cudatoolkit;
inherit (pkgs.stdenv) mkDerivation; inherit (pkgs.stdenv) mkDerivation;
}; };