From aadfab6fffde288d8535210f4de09e4b7cb01d80 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 10 Jun 2008 16:37:38 +0000 Subject: [PATCH] * Linux 2.6.25.6. svn path=/nixpkgs/trunk/; revision=12032 --- pkgs/os-specific/linux/kernel/linux-2.6.25.nix | 4 ++-- pkgs/os-specific/linux/opengl/xorg-sys/builder.sh | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.25.nix b/pkgs/os-specific/linux/kernel/linux-2.6.25.nix index 5de1e141901d..b1c64dc7168a 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.25.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.25.nix @@ -28,7 +28,7 @@ let lib = stdenv.lib; - version = "2.6.25.4"; + version = "2.6.25.6"; baseFeatures = { iwlwifi = true; @@ -49,7 +49,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2"; - sha256 = "0hp36pwphw5rs9kwm5ksr7ynfmzgpcd8gi45rigbilvcvmsdnxf3"; + sha256 = "1vf4hrj6qvdii4py6wwrkxx42pqaxzrn7a7sk34dsjm5n93i4sbi"; }; patches = map (p: p.patch) kernelPatches; diff --git a/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh b/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh index eb5dba481187..7ab20855bd31 100644 --- a/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh +++ b/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh @@ -3,8 +3,9 @@ source $stdenv/setup ensureDir $out/lib ln -s /usr/lib/libGL.so.1 $out/lib/ +ln -s /usr/lib/libGLU.so.1 $out/lib/ ln -s /usr/lib/libGLcore.so.1 $out/lib/ -ln -s /usr/lib/libnvidia-tls.so.1 $out/lib/ +ln -s /usr/lib/tls/libnvidia-tls.so.1 $out/lib/ #ln -s /usr/lib/libdrm.so.2 $out/lib/ for i in $neededLibs; do