diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-06-10 16:37:38 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-06-10 16:37:38 +0000 |
| commit | aadfab6fffde288d8535210f4de09e4b7cb01d80 (patch) | |
| tree | c8f3b482dbe6d2b7ca2e3a24a495b1a5e9231bf5 /pkgs/os-specific | |
| parent | 0283118633be409958442a4e062148de54a79ae8 (diff) | |
| download | nixpkgs-aadfab6fffde288d8535210f4de09e4b7cb01d80.tar nixpkgs-aadfab6fffde288d8535210f4de09e4b7cb01d80.tar.gz nixpkgs-aadfab6fffde288d8535210f4de09e4b7cb01d80.tar.bz2 nixpkgs-aadfab6fffde288d8535210f4de09e4b7cb01d80.tar.lz nixpkgs-aadfab6fffde288d8535210f4de09e4b7cb01d80.tar.xz nixpkgs-aadfab6fffde288d8535210f4de09e4b7cb01d80.tar.zst nixpkgs-aadfab6fffde288d8535210f4de09e4b7cb01d80.zip | |
* Linux 2.6.25.6.
svn path=/nixpkgs/trunk/; revision=12032
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-2.6.25.nix | 4 | ||||
| -rw-r--r-- | 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 5de1e141901..b1c64dc7168 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 eb5dba48118..7ab20855bd3 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 |