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

Merge branch 'master' into staging

Browse Source
This commit is contained in:
obadz
2016-08-23 18:50:06 +01:00
parent 13c04c837d 415e1983ca
commit 0e8d2725dc
244 changed files with 767 additions and 597 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/python-modules/libgpuarray/cuda/default.nix
View File

@@ -50,7 +50,7 @@ buildPythonPackage rec {
function fixRunPath {
p=$(patchelf --print-rpath $1)
patchelf --set-rpath "$p:${cudatoolkit}/lib:${clblas}/lib:${nvidia_x11}/lib" $1
patchelf --set-rpath "$p:${stdenv.lib.makeLibraryPath [ cudatoolkit clblas nvidia_x11 ]}" $1
}
fixRunPath Install/lib/libgpuarray.so

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

@@ -30,7 +30,7 @@ buildPythonPackage rec {
};
preConfigure = ''
findInputs ${boost} boost_dirs propagated-native-build-inputs
findInputs ${boost.dev} boost_dirs propagated-native-build-inputs
export BOOST_INCLUDEDIR=$(echo $boost_dirs | sed -e s/\ /\\n/g - | grep '\-dev')/include
export BOOST_LIBRARYDIR=$(echo $boost_dirs | sed -e s/\ /\\n/g - | grep -v '\-dev')/lib