diff options
author | Svein Ove Aas <sveina@gmail.com> | 2016-01-09 19:01:51 +0000 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-01-14 12:32:53 +0100 |
commit | 805d453bc227bd03afffa2feb8ac3accb46700e7 (patch) | |
tree | a6deddf5f004620b1466e33ee7e75f0a100b0824 /pkgs/os-specific | |
parent | a81b396a2ef082f51eb7fb63ca24353c289682d8 (diff) | |
download | nixlib-805d453bc227bd03afffa2feb8ac3accb46700e7.tar nixlib-805d453bc227bd03afffa2feb8ac3accb46700e7.tar.gz nixlib-805d453bc227bd03afffa2feb8ac3accb46700e7.tar.bz2 nixlib-805d453bc227bd03afffa2feb8ac3accb46700e7.tar.lz nixlib-805d453bc227bd03afffa2feb8ac3accb46700e7.tar.xz nixlib-805d453bc227bd03afffa2feb8ac3accb46700e7.tar.zst nixlib-805d453bc227bd03afffa2feb8ac3accb46700e7.zip |
nvidia: branch update 352.63 -> 358.16 (close #12272)
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
Diffstat (limited to 'pkgs/os-specific')
-rwxr-xr-x | pkgs/os-specific/linux/nvidia-x11/builder.sh | 16 | ||||
-rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/default.nix | 12 | ||||
-rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/nvidia-4.2.patch | 26 |
3 files changed, 11 insertions, 43 deletions
diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index ba65089a4f73..502648c1d513 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -21,14 +21,6 @@ buildPhase() { unset src # used by the nv makefile 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 .. fi } @@ -73,8 +65,12 @@ installPhase() { ln -srnf "$libname" "$libname_short.2" fi - ln -srnf "$libname" "$libname_short" - ln -srnf "$libname" "$libname_short.1" + if [[ "$libname" != "$libname_short" ]]; then + ln -srnf "$libname" "$libname_short" + fi + if [[ "$libname" != "$libname_short.1" ]]; then + ln -srnf "$libname" "$libname_short.1" + fi done #patchelf --set-rpath $out/lib:$glPath $out/lib/libGL.so.*.* diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 09630b402494..fff1135d3118 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -12,7 +12,7 @@ assert (!libsOnly) -> kernel != null; let - versionNumber = "352.63"; + versionNumber = "358.16"; # Policy: use the highest stable version as the default (on our master). inherit (stdenv.lib) makeLibraryPath; @@ -27,18 +27,16 @@ stdenv.mkDerivation { src = if stdenv.system == "i686-linux" then fetchurl { - url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "0vxrx2hmycvhyp32mapf1vv01ddlghliwsvkhsg29hv3a7fl4i28"; + url = "http://download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; + sha256 = "1cc0zsri92nz2mznabfd6pqckm9mlbszmysqqqh3w5mipwn898nk"; } else if stdenv.system == "x86_64-linux" then fetchurl { - url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "11dgvsygavdsgbgq87d3d2sj3dc85f2yarr71qczkgiqa030yb1k"; + url = "http://download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; + sha256 = "1xr16faam2zsx8ajwm9g9302m6qjzyjh1zd56g8jhc8jxg8h43sg"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; - patches = [ ./nvidia-4.2.patch ]; - inherit versionNumber libsOnly; inherit (stdenv) system; diff --git a/pkgs/os-specific/linux/nvidia-x11/nvidia-4.2.patch b/pkgs/os-specific/linux/nvidia-x11/nvidia-4.2.patch deleted file mode 100644 index 412b786179ae..000000000000 --- a/pkgs/os-specific/linux/nvidia-x11/nvidia-4.2.patch +++ /dev/null @@ -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"); |