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

nvidia: branch update 352.63 -> 358.16 (close #12272)

Browse Source 
Tested & reviewed by vcunat:
- the patch seems not needed anymore,
- reflects changes in their build system
  ftp://download.nvidia.com/XFree86/packaging/linux/new-kbuild-for-355/README
This commit is contained in:
Svein Ove Aas 2016-01-09 19:01:51 +00:00 committed by Vladimír Čunát
parent a81b396a2e
commit 805d453bc2
3 changed files with 11 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,14 +21,6 @@ buildPhase() {
unset src # used by the nv makefile unset src # used by the nv makefile
make SYSSRC=$sysSrc SYSOUT=$sysOut module make SYSSRC=$sysSrc SYSOUT=$sysOut module
# nvidia no longer provides uvm kernel module for 32-bit archs
# http://www.nvidia.com/download/driverResults.aspx/79722/en-us
if [[ "$system" = "x86_64-linux" ]]; then
cd uvm
make SYSSRC=$sysSrc SYSOUT=$sysOut module
cd ..
fi
cd .. cd ..
fi fi
} }
@ -73,8 +65,12 @@ installPhase() {
ln -srnf "$libname" "$libname_short.2" ln -srnf "$libname" "$libname_short.2"
fi fi
ln -srnf "$libname" "$libname_short" if [[ "$libname" != "$libname_short" ]]; then
ln -srnf "$libname" "$libname_short.1" ln -srnf "$libname" "$libname_short"
fi
if [[ "$libname" != "$libname_short.1" ]]; then
ln -srnf "$libname" "$libname_short.1"
fi
done done
#patchelf --set-rpath $out/lib:$glPath $out/lib/libGL.so.*.* #patchelf --set-rpath $out/lib:$glPath $out/lib/libGL.so.*.*

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

@ -12,7 +12,7 @@ assert (!libsOnly) -> kernel != null;
let let
versionNumber = "352.63"; versionNumber = "358.16";
# 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;
@ -27,18 +27,16 @@ stdenv.mkDerivation {
src = src =
if stdenv.system == "i686-linux" then if stdenv.system == "i686-linux" then
fetchurl { fetchurl {
url = "http://us.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 = "0vxrx2hmycvhyp32mapf1vv01ddlghliwsvkhsg29hv3a7fl4i28"; sha256 = "1cc0zsri92nz2mznabfd6pqckm9mlbszmysqqqh3w5mipwn898nk";
} }
else if stdenv.system == "x86_64-linux" then else if stdenv.system == "x86_64-linux" then
fetchurl { fetchurl {
url = "http://us.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 = "11dgvsygavdsgbgq87d3d2sj3dc85f2yarr71qczkgiqa030yb1k"; sha256 = "1xr16faam2zsx8ajwm9g9302m6qjzyjh1zd56g8jhc8jxg8h43sg";
} }
else throw "nvidia-x11 does not support platform ${stdenv.system}"; else throw "nvidia-x11 does not support platform ${stdenv.system}";
patches = [ ./nvidia-4.2.patch ];
inherit versionNumber libsOnly; inherit versionNumber libsOnly;
inherit (stdenv) system; inherit (stdenv) system;

26
pkgs/os-specific/linux/nvidia-x11/nvidia-4.2.patch
View File

@ -1,26 +0,0 @@
diff --git a/kernel/nv-frontend.c b/kernel/nv-frontend.c
index 65bbb1b..be39c8d 100644
--- a/kernel/nv-frontend.c
+++ b/kernel/nv-frontend.c
@@ -15,7 +15,7 @@
#include "nv-frontend.h"
#if defined(MODULE_LICENSE)
-MODULE_LICENSE("NVIDIA");
+MODULE_LICENSE("GPL\0NVIDIA");
#endif
#if defined(MODULE_INFO)
MODULE_INFO(supported, "external");
diff --git a/kernel/nv.c b/kernel/nv.c
index abe81ed..05945b5 100644
--- a/kernel/nv.c
+++ b/kernel/nv.c
@@ -31,7 +31,7 @@
#if defined(NV_VMWARE) || (NV_BUILD_MODULE_INSTANCES != 0)
#if defined(MODULE_LICENSE)
-MODULE_LICENSE("NVIDIA");
+MODULE_LICENSE("GPL\0NVIDIA");
#endif
#if defined(MODULE_INFO)
MODULE_INFO(supported, "external");