diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-05-22 12:51:55 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-05-22 13:00:51 +0200 |
commit | 5ec3a63fcbbe8daabe6da595e250b1fba507e51f (patch) | |
tree | c278c6a9c462db9fae1962ab45a2026184a390e1 /pkgs/os-specific/linux/nvidia-x11 | |
parent | 3ec28512640d119ba593f3a7d2627b4679921a36 (diff) | |
download | nixlib-5ec3a63fcbbe8daabe6da595e250b1fba507e51f.tar nixlib-5ec3a63fcbbe8daabe6da595e250b1fba507e51f.tar.gz nixlib-5ec3a63fcbbe8daabe6da595e250b1fba507e51f.tar.bz2 nixlib-5ec3a63fcbbe8daabe6da595e250b1fba507e51f.tar.lz nixlib-5ec3a63fcbbe8daabe6da595e250b1fba507e51f.tar.xz nixlib-5ec3a63fcbbe8daabe6da595e250b1fba507e51f.tar.zst nixlib-5ec3a63fcbbe8daabe6da595e250b1fba507e51f.zip |
nvidia-x11: Update to 331.79
Diffstat (limited to 'pkgs/os-specific/linux/nvidia-x11')
-rwxr-xr-x | pkgs/os-specific/linux/nvidia-x11/builder.sh | 10 | ||||
-rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/default.nix | 6 |
2 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 51144bc10519..06ab334e3071 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -74,9 +74,9 @@ installPhase() { mkdir -p $out/bin for i in nvidia-settings nvidia-smi nvidia-xconfig; do - cp $i $out/bin/$i - patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ - --set-rpath $out/lib:$programPath:$glPath $out/bin/$i + cp $i $out/bin/$i + patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-rpath $out/lib:$programPath:$glPath $out/bin/$i done # Header files etc. @@ -96,6 +96,10 @@ installPhase() { substituteInPlace $out/share/applications/nvidia-settings.desktop \ --replace '__UTILS_PATH__' $out/bin \ --replace '__PIXMAP_PATH__' $out/share/pixmaps + + # Test a bit. + $out/bin/nvidia-settings --version + $out/bin/nvidia-smi --help > /dev/null fi } diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 2afbf12097cd..0c0f6ecc71ee 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 = "331.67"; + versionNumber = "331.79"; in @@ -25,12 +25,12 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "1imc66yxnm01i58xwqrwqc612h0rhdz8x170hqr2pjyk99bllsv9"; + sha256 = "0dl6gj1k6rz7bzyflfgi8y4489bxv03gfcni7zjzy440xjm3sk9l"; } 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 = "0qxd4jd25ymcr6w97f71kfn549x6wgg4g3vixd3sqlczknn85f47"; + sha256 = "14mwxz12kd5znnrmwia4qk35sd7xpr6cgpxs1xzjwmjgvz6gc71v"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; |