pyrox.dev / nixpkgs
lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

pythonPackages.libgpuarray: fix opengl runpath

nvidia_x11 libs should be picked up from
/run/opengl-driver/lib at runtime

Ryan Burns 11bf0ac2 eb71bcd0

+11 -8
+11 -7
pkgs/development/python-modules/libgpuarray/default.nix
··· 1 1 { stdenv 2 2 , lib 3 + , addOpenGLRunpath 3 4 , buildPythonPackage 4 5 , fetchFromGitHub 5 6 , cmake ··· 8 9 , six 9 10 , nose 10 11 , Mako 11 - , cudaSupport ? false, cudatoolkit , nvidia_x11 12 + , cudaSupport ? false, cudatoolkit 12 13 , openclSupport ? true, ocl-icd, clblas 13 14 }: 14 - 15 - assert cudaSupport -> nvidia_x11 != null 16 - && cudatoolkit != null; 17 15 18 16 buildPythonPackage rec { 19 17 pname = "libgpuarray"; ··· 32 30 configurePhase = "cmakeConfigurePhase"; 33 31 34 32 libraryPath = lib.makeLibraryPath ( 35 - [] 36 - ++ lib.optionals cudaSupport [ cudatoolkit.lib cudatoolkit.out nvidia_x11 ] 33 + lib.optionals cudaSupport [ cudatoolkit.lib cudatoolkit.out ] 37 34 ++ lib.optionals openclSupport ([ clblas ] ++ lib.optional (!stdenv.isDarwin) ocl-icd) 38 35 ); 39 36 ··· 55 52 } 56 53 57 54 fixRunPath $out/lib/libgpuarray.so 55 + '' + lib.optionalString cudaSupport '' 56 + addOpenGLRunpath $out/lib/libgpuarray.so 58 57 ''; 59 58 60 59 propagatedBuildInputs = [ ··· 63 62 Mako 64 63 ]; 65 64 66 - nativeBuildInputs = [ cmake ]; 65 + nativeBuildInputs = [ 66 + cmake 67 + ] ++ lib.optionals cudaSupport [ 68 + addOpenGLRunpath 69 + ]; 70 + 67 71 68 72 buildInputs = [ 69 73 cython
-1
pkgs/top-level/python-packages.nix
··· 4138 4138 libgpuarray = callPackage ../development/python-modules/libgpuarray { 4139 4139 clblas = pkgs.clblas.override { boost = self.boost; }; 4140 4140 cudaSupport = pkgs.config.cudaSupport or false; 4141 - inherit (pkgs.linuxPackages) nvidia_x11; 4142 4141 }; 4143 4142 4144 4143 libiio = (toPythonModule (pkgs.libiio.override { inherit python; })).python;