nvidia-x11: Update to 331.79

This commit is contained in:
Eelco Dolstra 2014-05-22 12:51:55 +02:00
parent 3ec2851264
commit 5ec3a63fcb
2 changed files with 10 additions and 6 deletions

View File

@ -74,9 +74,9 @@ installPhase() {
mkdir -p $out/bin mkdir -p $out/bin
for i in nvidia-settings nvidia-smi nvidia-xconfig; do for i in nvidia-settings nvidia-smi nvidia-xconfig; do
cp $i $out/bin/$i cp $i $out/bin/$i
patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
--set-rpath $out/lib:$programPath:$glPath $out/bin/$i --set-rpath $out/lib:$programPath:$glPath $out/bin/$i
done done
# Header files etc. # Header files etc.
@ -96,6 +96,10 @@ installPhase() {
substituteInPlace $out/share/applications/nvidia-settings.desktop \ substituteInPlace $out/share/applications/nvidia-settings.desktop \
--replace '__UTILS_PATH__' $out/bin \ --replace '__UTILS_PATH__' $out/bin \
--replace '__PIXMAP_PATH__' $out/share/pixmaps --replace '__PIXMAP_PATH__' $out/share/pixmaps
# Test a bit.
$out/bin/nvidia-settings --version
$out/bin/nvidia-smi --help > /dev/null
fi fi
} }

View File

@ -12,7 +12,7 @@ assert (!libsOnly) -> kernel != null;
let let
versionNumber = "331.67"; versionNumber = "331.79";
in in
@ -25,12 +25,12 @@ stdenv.mkDerivation {
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://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 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://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}"; else throw "nvidia-x11 does not support platform ${stdenv.system}";