ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2025-01-06 04:24:28 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #33016 from dylex/pycuda

Browse Source 
pycuda: fix boost_python3 link
This commit is contained in:
Frederik Rietdijk 2017-12-23 21:32:45 +00:00 committed by GitHub
commit ae15ee42ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,8 +13,7 @@
, python , python
, mkDerivation , mkDerivation
, stdenv , stdenv
, pythonOlder , isPy3k
, isPy35
}: }:
let let
compyte = import ./compyte.nix { compyte = import ./compyte.nix {
@ -35,7 +34,7 @@ buildPythonPackage rec {
${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 --boost-python-libname=boost_python${stdenv.lib.optionalString isPy3k "3"}
''; '';
postInstall = '' postInstall = ''

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

@ -6524,7 +6524,6 @@ in {
pycuda = callPackage ../development/python-modules/pycuda rec { pycuda = callPackage ../development/python-modules/pycuda rec {
cudatoolkit = pkgs.cudatoolkit75; cudatoolkit = pkgs.cudatoolkit75;
inherit (pkgs.stdenv) mkDerivation; inherit (pkgs.stdenv) mkDerivation;
inherit pythonOlder;
}; };
pyphen = callPackage ../development/python-modules/pyphen {}; pyphen = callPackage ../development/python-modules/pyphen {};