Merge pull request #288738 from samuela/samuela/jaxlib-bin

python3Packages.jaxlib-bin: use `autoAddOpenGLRunpathHook`

authored by Samuel Ainsworth and committed by GitHub 8e573554 ceef74d1

+2 -5
+2 -5
pkgs/development/python-modules/jaxlib/bin.nix
··· 14 14 # * https://github.com/google/jax/issues/5723#issuecomment-913038780 15 15 16 16 { absl-py 17 - , addOpenGLRunpath 18 17 , autoPatchelfHook 19 18 , buildPythonPackage 20 19 , config ··· 33 32 }: 34 33 35 34 let 36 - inherit (cudaPackagesGoogle) cudatoolkit cudnn cudaVersion; 35 + inherit (cudaPackagesGoogle) autoAddOpenGLRunpathHook cudatoolkit cudnn cudaVersion; 37 36 38 37 version = "0.4.24"; 39 38 ··· 181 180 # Prebuilt wheels are dynamically linked against things that nix can't find. 182 181 # Run `autoPatchelfHook` to automagically fix them. 183 182 nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ] 184 - ++ lib.optionals cudaSupport [ addOpenGLRunpath ]; 183 + ++ lib.optionals cudaSupport [ autoAddOpenGLRunpathHook ]; 185 184 # Dynamic link dependencies 186 185 buildInputs = [ stdenv.cc.cc.lib ]; 187 186 ··· 196 195 # * libcuda.so.1 -> opengl driver in /run/opengl-driver/lib 197 196 preInstallCheck = lib.optional cudaSupport '' 198 197 shopt -s globstar 199 - 200 - addOpenGLRunpath $out/**/*.so 201 198 202 199 for file in $out/**/*.so; do 203 200 rpath=$(patchelf --print-rpath $file)