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

nvidia-x11: 358.16 -> 361.42

Browse Source 
This fixes the segfault reported in #13942 caused by missing
libEGL.so.0 and libEGL_nvidia.so.0 symlinks.
This commit is contained in:
Eelco Dolstra 2016-04-06 15:50:01 +02:00
parent 77103edec2
commit 59ef7d25c3
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,6 +34,8 @@ installPhase() {
cp -prd *.so.* tls "$out/lib/" cp -prd *.so.* tls "$out/lib/"
rm "$out"/lib/lib{glx,nvidia-wfb}.so.* # handled separately rm "$out"/lib/lib{glx,nvidia-wfb}.so.* # handled separately
rm $out/lib/libGL.so.1.* # GLVND
if test -z "$libsOnly"; then if test -z "$libsOnly"; then
# Install the X drivers. # Install the X drivers.
mkdir -p $out/lib/xorg/modules mkdir -p $out/lib/xorg/modules
@ -60,16 +62,18 @@ installPhase() {
libname_short=`echo -n "$libname" | sed 's/so\..*/so/'` 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 if [[ "$libname" != "$libname_short" ]]; then
ln -srnf "$libname" "$libname_short" ln -srnf "$libname" "$libname_short"
fi 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 fi
done done
@ -119,9 +123,6 @@ installPhase() {
# For simplicity and dependency reduction, don't support the gtk3 interface. # For simplicity and dependency reduction, don't support the gtk3 interface.
rm $out/lib/libnvidia-gtk3.* rm $out/lib/libnvidia-gtk3.*
# We distribute these separately in `libvdpau`
rm "$out"/lib/libvdpau{.*,_trace.*}
# Move VDPAU libraries to their place # Move VDPAU libraries to their place
mkdir "$out"/lib/vdpau mkdir "$out"/lib/vdpau
mv "$out"/lib/libvdpau* "$out"/lib/vdpau mv "$out"/lib/libvdpau* "$out"/lib/vdpau

6
pkgs/os-specific/linux/nvidia-x11/default.nix
View File

@ -12,7 +12,7 @@ assert (!libsOnly) -> kernel != null;
let let
versionNumber = "358.16"; versionNumber = "361.42";
# Policy: use the highest stable version as the default (on our master). # Policy: use the highest stable version as the default (on our master).
inherit (stdenv.lib) makeLibraryPath; inherit (stdenv.lib) makeLibraryPath;
@ -28,12 +28,12 @@ stdenv.mkDerivation {
if stdenv.system == "i686-linux" then if stdenv.system == "i686-linux" then
fetchurl { fetchurl {
url = "http://download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; url = "http://download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
sha256 = "1cc0zsri92nz2mznabfd6pqckm9mlbszmysqqqh3w5mipwn898nk"; sha256 = "10jfdrmjcddgp7kg9l3dwxjh4b7sdrg86nwaf6zalfnsc9zh8bg3";
} }
else if stdenv.system == "x86_64-linux" then else if stdenv.system == "x86_64-linux" then
fetchurl { fetchurl {
url = "http://download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; url = "http://download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run";
sha256 = "1xr16faam2zsx8ajwm9g9302m6qjzyjh1zd56g8jhc8jxg8h43sg"; sha256 = "04yyrzk4xzq1i386mdxfwg4dqiclvj1fm195qsqy0r79zmpc3kq4";
} }
else throw "nvidia-x11 does not support platform ${stdenv.system}"; else throw "nvidia-x11 does not support platform ${stdenv.system}";