From 589d4640fb154873feaf7167f13555d653aa2a6d Mon Sep 17 00:00:00 2001 From: Dylan Simon Date: Sat, 23 Dec 2017 16:02:47 -0500 Subject: [PATCH] pycuda: fix boost_python3 link Boost python library now named -lboost_python3 on py3. Remove a couple unused inputs. --- pkgs/development/python-modules/pycuda/default.nix | 5 ++--- pkgs/top-level/python-packages.nix | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pycuda/default.nix b/pkgs/development/python-modules/pycuda/default.nix index 0bd8800eddc..eb7459b0779 100644 --- a/pkgs/development/python-modules/pycuda/default.nix +++ b/pkgs/development/python-modules/pycuda/default.nix @@ -13,8 +13,7 @@ , python , mkDerivation , stdenv -, pythonOlder -, isPy35 +, isPy3k }: let compyte = import ./compyte.nix { @@ -35,7 +34,7 @@ buildPythonPackage rec { ${python.interpreter} configure.py --boost-inc-dir=${boost.dev}/include \ --boost-lib-dir=${boost}/lib \ --no-use-shipped-boost \ - --boost-python-libname=boost_python + --boost-python-libname=boost_python${stdenv.lib.optionalString isPy3k "3"} ''; postInstall = '' diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9f438a64370..80fbc3d544c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6524,7 +6524,6 @@ in { pycuda = callPackage ../development/python-modules/pycuda rec { cudatoolkit = pkgs.cudatoolkit75; inherit (pkgs.stdenv) mkDerivation; - inherit pythonOlder; }; pyphen = callPackage ../development/python-modules/pyphen {};