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

Merge pull request #62870 from ambrop72/nvidia-icd-absolute

Browse Source 
nvidia-x11: Put absolute library paths into ICD config files.
This commit is contained in:
Matthew Bauer 2019-07-10 17:37:00 -04:00 committed by GitHub
commit 87ec2627b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/os-specific/linux/nvidia-x11/builder.sh
View File

@ -58,14 +58,16 @@ installPhase() {
mkdir $i/lib/vdpau mkdir $i/lib/vdpau
mv $i/lib/libvdpau* $i/lib/vdpau mv $i/lib/libvdpau* $i/lib/vdpau
# Install ICDs. # Install ICDs, make absolute paths.
install -Dm644 nvidia.icd $i/etc/OpenCL/vendors/nvidia.icd sed -E "s#(libnvidia-opencl)#$i/lib/\\1#" nvidia.icd > nvidia.icd.fixed
install -Dm644 nvidia.icd.fixed $i/etc/OpenCL/vendors/nvidia.icd
if [ -e nvidia_icd.json.template ]; then if [ -e nvidia_icd.json.template ]; then
sed "s#__NV_VK_ICD__#libGLX_nvidia.so#" nvidia_icd.json.template > nvidia_icd.json sed "s#__NV_VK_ICD__#$i/lib/libGLX_nvidia.so#" nvidia_icd.json.template > nvidia_icd.json
install -Dm644 nvidia_icd.json $i/share/vulkan/icd.d/nvidia.json install -Dm644 nvidia_icd.json $i/share/vulkan/icd.d/nvidia.json
fi fi
if [ "$useGLVND" = "1" ]; then if [ "$useGLVND" = "1" ]; then
install -Dm644 10_nvidia.json $i/share/glvnd/egl_vendor.d/nvidia.json sed -E "s#(libEGL_nvidia)#$i/lib/\\1#" 10_nvidia.json > 10_nvidia.json.fixed
install -Dm644 10_nvidia.json.fixed $i/share/glvnd/egl_vendor.d/nvidia.json
fi fi
done done