a589bfae17
In most cases, this just meant changing kernelDev (now removed from linuxPackagesFor) to kernel.dev. Some packages needed more work (though whether that was because of my changes or because they were already broken, I'm not sure). Specifics: * psmouse-alps builds on 3.4 but not 3.10, as noted in the comments that were already there * blcr builds on 3.4 but not 3.10, as noted in comments that were already there * open-iscsi, ati-drivers, wis-go7007, and openafsClient don't build on 3.4 or 3.10 on this branch or on master, so they're marked broken * A version-specific kernelHeaders package was added The following packages were removed: * atheros/madwifi is superceded by official ath*k modules * aufs is no longer used by any of our kernels * broadcom-sta v6 (which was already packaged) replaces broadcom-sta * exmap has not been updated since 2011 and doesn't build * iscis-target has not been updated since 2010 and doesn't build * iwlwifi is part of mainline now and doesn't build * nivida-x11-legacy-96 hasn't been updated since 2008 and doesn't build Everything not specifically mentioned above builds successfully on 3.10. I haven't yet tested on 3.4, but will before opening a pull request. Signed-off-by: Shea Levy <shea@shealevy.com>
60 lines
1.8 KiB
Nix
60 lines
1.8 KiB
Nix
{ stdenv, fetchurl, kernel ? null, xlibs, zlib, perl
|
|
, gtk, atk, pango, glib, gdk_pixbuf
|
|
, # Whether to build the libraries only (i.e. not the kernel module or
|
|
# nvidia-settings). Used to support 32-bit binaries on 64-bit
|
|
# Linux.
|
|
libsOnly ? false
|
|
}:
|
|
|
|
with stdenv.lib;
|
|
|
|
let
|
|
|
|
versionNumber = "331.20";
|
|
|
|
in
|
|
|
|
stdenv.mkDerivation {
|
|
name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}";
|
|
|
|
builder = ./builder.sh;
|
|
|
|
src =
|
|
if stdenv.system == "i686-linux" then
|
|
fetchurl {
|
|
url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
|
|
sha256 = "0icpmfsppnsvk7vj0fshi3ry4s1wix435s2c8wwak47765fv1mks";
|
|
}
|
|
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 = "02503dis3ngraqv7174a4pay2x08hp697n9q74rpjjclf5k74ax1";
|
|
}
|
|
else throw "nvidia-x11 does not support platform ${stdenv.system}";
|
|
|
|
inherit versionNumber libsOnly;
|
|
|
|
kernel = if libsOnly then null else kernel.dev;
|
|
|
|
dontStrip = true;
|
|
|
|
glPath = stdenv.lib.makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr];
|
|
|
|
cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.gcc.gcc];
|
|
|
|
openclPath = stdenv.lib.makeLibraryPath [zlib];
|
|
|
|
programPath = optionalString (!libsOnly) (stdenv.lib.makeLibraryPath
|
|
[ gtk atk pango glib gdk_pixbuf xlibs.libXv ] );
|
|
|
|
buildInputs = [ perl ];
|
|
|
|
meta = {
|
|
homepage = http://www.nvidia.com/object/unix.html;
|
|
description = "X.org driver and kernel module for NVIDIA graphics cards";
|
|
license = stdenv.lib.licenses.unfreeRedistributable;
|
|
platforms = stdenv.lib.platforms.linux;
|
|
hydraPlatforms = [];
|
|
};
|
|
}
|