diff options
author | Ambroz Bizjak <abizjak.pro@gmail.com> | 2019-06-08 20:56:13 +0200 |
---|---|---|
committer | Nikolay Amiantov <ab@fmap.me> | 2019-08-18 21:29:42 +0300 |
commit | 1bba961e2a1b143faa5589047f07df559178d4a8 (patch) | |
tree | cd820874ac40c2d3c711ae0b12d2c7cea832eed9 /pkgs/development/libraries/ocl-icd | |
parent | ebe711a12ffce966f6aebab91494d06dbde58f53 (diff) | |
download | nixpkgs-1bba961e2a1b143faa5589047f07df559178d4a8.tar nixpkgs-1bba961e2a1b143faa5589047f07df559178d4a8.tar.gz nixpkgs-1bba961e2a1b143faa5589047f07df559178d4a8.tar.bz2 nixpkgs-1bba961e2a1b143faa5589047f07df559178d4a8.tar.lz nixpkgs-1bba961e2a1b143faa5589047f07df559178d4a8.tar.xz nixpkgs-1bba961e2a1b143faa5589047f07df559178d4a8.tar.zst nixpkgs-1bba961e2a1b143faa5589047f07df559178d4a8.zip |
libglvnd, ocl-icd, vulkan-loader: Remove addOpenGLRunpath where not needed.
For APIs that use driver config files, the config files should point to libraries using absolute paths, so `RUNPATH` should be unnecessary. It is still needed for `libGLX` because that does not use config files but the dispatch library receives just a vendor name from the X server.
Diffstat (limited to 'pkgs/development/libraries/ocl-icd')
-rw-r--r-- | pkgs/development/libraries/ocl-icd/default.nix | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/pkgs/development/libraries/ocl-icd/default.nix b/pkgs/development/libraries/ocl-icd/default.nix index 6cab843a22b..84205253554 100644 --- a/pkgs/development/libraries/ocl-icd/default.nix +++ b/pkgs/development/libraries/ocl-icd/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0f14gpa13sdm0kzqv5yycp4pschbmi6n5fj7wl4ilspzsrqcgqr2"; }; - nativeBuildInputs = [ ruby addOpenGLRunpath ]; + nativeBuildInputs = [ ruby ]; buildInputs = [ opencl-headers ]; @@ -17,12 +17,6 @@ stdenv.mkDerivation rec { sed -i 's,"/etc/OpenCL/vendors","${addOpenGLRunpath.driverLink}/etc/OpenCL/vendors",g' ocl_icd_loader.c ''; - # Set RUNPATH so that driver libraries in /run/opengl-driver(-32)/lib can be found. - # See the explanation in addOpenGLRunpath. - postFixup = '' - addOpenGLRunpath $out/lib/libOpenCL.so - ''; - meta = with stdenv.lib; { description = "OpenCL ICD Loader for ${opencl-headers.name}"; homepage = https://forge.imag.fr/projects/ocl-icd/; |