diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-04-06 15:50:01 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-04-06 15:53:14 +0200 |
commit | 59ef7d25c3944f2b46461181f6bc99f183389644 (patch) | |
tree | 6b30293277c8195c2164ab39b4b27df3edf8ceb9 /pkgs/os-specific/linux/nvidia-x11/builder.sh | |
parent | 77103edec2456984ee3c7aae8adb29aefe36af8e (diff) | |
download | nixpkgs-59ef7d25c3944f2b46461181f6bc99f183389644.tar nixpkgs-59ef7d25c3944f2b46461181f6bc99f183389644.tar.gz nixpkgs-59ef7d25c3944f2b46461181f6bc99f183389644.tar.bz2 nixpkgs-59ef7d25c3944f2b46461181f6bc99f183389644.tar.lz nixpkgs-59ef7d25c3944f2b46461181f6bc99f183389644.tar.xz nixpkgs-59ef7d25c3944f2b46461181f6bc99f183389644.tar.zst nixpkgs-59ef7d25c3944f2b46461181f6bc99f183389644.zip |
nvidia-x11: 358.16 -> 361.42
This fixes the segfault reported in #13942 caused by missing libEGL.so.0 and libEGL_nvidia.so.0 symlinks.
Diffstat (limited to 'pkgs/os-specific/linux/nvidia-x11/builder.sh')
-rwxr-xr-x | pkgs/os-specific/linux/nvidia-x11/builder.sh | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index c1f165c45dd..1f4671a7615 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -34,6 +34,8 @@ installPhase() { cp -prd *.so.* tls "$out/lib/" rm "$out"/lib/lib{glx,nvidia-wfb}.so.* # handled separately + rm $out/lib/libGL.so.1.* # GLVND + if test -z "$libsOnly"; then # Install the X drivers. mkdir -p $out/lib/xorg/modules @@ -60,16 +62,18 @@ installPhase() { libname_short=`echo -n "$libname" | sed 's/so\..*/so/'` - # nvidia's EGL stack seems to expect libGLESv2.so.2 to be available - if [ $(basename "$libname_short") == "libGLESv2.so" ]; then - ln -srnf "$libname" "$libname_short.2" - fi - if [[ "$libname" != "$libname_short" ]]; then ln -srnf "$libname" "$libname_short" fi - if [[ "$libname" != "$libname_short.1" ]]; then - ln -srnf "$libname" "$libname_short.1" + + if [[ $libname_short =~ libEGL.so || $libname_short =~ libEGL_nvidia.so ]]; then + major=0 + else + major=1 + fi + + if [[ "$libname" != "$libname_short.$major" ]]; then + ln -srnf "$libname" "$libname_short.$major" fi done @@ -119,9 +123,6 @@ installPhase() { # For simplicity and dependency reduction, don't support the gtk3 interface. rm $out/lib/libnvidia-gtk3.* - # We distribute these separately in `libvdpau` - rm "$out"/lib/libvdpau{.*,_trace.*} - # Move VDPAU libraries to their place mkdir "$out"/lib/vdpau mv "$out"/lib/libvdpau* "$out"/lib/vdpau |