diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2019-07-10 17:37:00 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-10 17:37:00 -0400 |
commit | 87ec2627b0dbfbdc4eb2d9e88ed42ce2b32b76af (patch) | |
tree | 84c6742691c359bc36cdfaccb83b7e4467052cb6 | |
parent | f5702549bc76705eba73ff350f3686f84fdc24eb (diff) | |
parent | a4de5673de10e1623c893b7f107825daaacb5420 (diff) | |
download | nixlib-87ec2627b0dbfbdc4eb2d9e88ed42ce2b32b76af.tar nixlib-87ec2627b0dbfbdc4eb2d9e88ed42ce2b32b76af.tar.gz nixlib-87ec2627b0dbfbdc4eb2d9e88ed42ce2b32b76af.tar.bz2 nixlib-87ec2627b0dbfbdc4eb2d9e88ed42ce2b32b76af.tar.lz nixlib-87ec2627b0dbfbdc4eb2d9e88ed42ce2b32b76af.tar.xz nixlib-87ec2627b0dbfbdc4eb2d9e88ed42ce2b32b76af.tar.zst nixlib-87ec2627b0dbfbdc4eb2d9e88ed42ce2b32b76af.zip |
Merge pull request #62870 from ambrop72/nvidia-icd-absolute
nvidia-x11: Put absolute library paths into ICD config files.
-rwxr-xr-x | pkgs/os-specific/linux/nvidia-x11/builder.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index a30f1d7f5936..467d930aaf58 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -58,14 +58,16 @@ installPhase() { mkdir $i/lib/vdpau mv $i/lib/libvdpau* $i/lib/vdpau - # Install ICDs. - install -Dm644 nvidia.icd $i/etc/OpenCL/vendors/nvidia.icd + # Install ICDs, make absolute paths. + 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 - 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 fi 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 done |