Merge pull request #33016 from dylex/pycuda · pyrox.dev/nixpkgs@ae15ee4

pyrox.dev / nixpkgs

fork atom

lol

fork atom

Merge pull request #33016 from dylex/pycuda

pycuda: fix boost_python3 link

authored by

Frederik Rietdijk and committed by

GitHub 8 years ago ae15ee42 428708fe

+2 -4

2 changed files

expand all

unified split

pkgs

development

python-modules

pycuda

default.nix

top-level

python-packages.nix

+2 -3

pkgs/development/python-modules/pycuda/default.nix

··· 13 13 , python 14 14 , mkDerivation 15 15 , stdenv 16 - , pythonOlder 17 - , isPy35 16 + , isPy3k 18 17 }: 19 18 let 20 19 compyte = import ./compyte.nix { ··· 35 34 ${python.interpreter} configure.py --boost-inc-dir=${boost.dev}/include \ 36 35 --boost-lib-dir=${boost}/lib \ 37 36 --no-use-shipped-boost \ 38 - --boost-python-libname=boost_python 37 + --boost-python-libname=boost_python${stdenv.lib.optionalString isPy3k "3"} 39 38 ''; 40 39 41 40 postInstall = ''

-1

pkgs/top-level/python-packages.nix

··· 6524 6524 pycuda = callPackage ../development/python-modules/pycuda rec { 6525 6525 cudatoolkit = pkgs.cudatoolkit75; 6526 6526 inherit (pkgs.stdenv) mkDerivation; 6527 - inherit pythonOlder; 6528 6527 }; 6529 6528 6530 6529 pyphen = callPackage ../development/python-modules/pyphen {};