Author: shlevy
Date: Tue Mar 20 16:29:22 2012
New Revision: 33300
URL: https://nixos.org/websvn/nix/?rev=33300&sc=1
Log:
Add nouveau xorg video driver
Added:
nixpkgs/trunk/pkgs/os-specific/linux/xf86-video-nouveau/
nixpkgs/trunk/pkgs/os-specific/linux/xf86-video-nouveau/default.nix
Modified:
nixos/trunk/modules/services/x11/xserver.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixos/trunk/modules/services/x11/xserver.nix
==============================================================================
--- nixos/trunk/modules/services/x11/xserver.nix Tue Mar 20 16:17:46
2012 (r33299)
+++ nixos/trunk/modules/services/x11/xserver.nix Tue Mar 20 16:29:22
2012 (r33300)
@@ -14,6 +14,7 @@
# Map video driver names to driver packages.
knownVideoDrivers = {
ati_unfree = { modules = [ kernelPackages.ati_drivers_x11 ]; driverName
= "fglrx"; };
+ nouveau = { modules = [ pkgs.xf86_video_nouveau ]; };
nvidia = { modules = [ kernelPackages.nvidia_x11 ]; };
nvidiaLegacy96 = { modules = [ kernelPackages.nvidia_x11_legacy96 ];
driverName = "nvidia"; };
nvidiaLegacy173 = { modules = [ kernelPackages.nvidia_x11_legacy173 ];
driverName = "nvidia"; };
Added: nixpkgs/trunk/pkgs/os-specific/linux/xf86-video-nouveau/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/os-specific/linux/xf86-video-nouveau/default.nix Tue Mar
20 16:29:22 2012 (r33300)
@@ -0,0 +1,41 @@
+{ stdenv
+, fetchgit
+, autoconf
+, automake
+, libtool
+, xorgserver, xproto, fontsproto, xf86driproto, renderproto, videoproto
+, utilmacros
+, libdrm
+, pkgconfig }:
+
+stdenv.mkDerivation {
+ name = "xf86-video-nouveau-2012-03-05";
+
+ src = fetchgit {
+ url = git://anongit.freedesktop.org/nouveau/xf86-video-nouveau;
+ rev = "f5d1cd2cb6808838ae1a188cef888eaa9582c76d";
+ sha256 =
"8c20e9ce7897fbd4c5097e4738e80ecca30e6326b758a13fc97f96ccc12fd7d9";
+ };
+
+ buildInputs = [
+ autoconf
+ automake
+ libtool
+ xorgserver xproto fontsproto xf86driproto renderproto videoproto
+ utilmacros
+ libdrm
+ pkgconfig
+ ];
+
+ preConfigure = "autoreconf -vfi";
+
+ meta = {
+ homepage = http://nouveau.freedesktop.org/wiki/;
+
+ description = "The xorg driver for nouveau-driven video cards";
+
+ license = "gplv2";
+
+ maintainers = [ stdenv.lib.maintainers.shlevy ];
+ };
+}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Mar 20 16:17:46
2012 (r33299)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Mar 20 16:29:22
2012 (r33300)
@@ -6082,6 +6082,11 @@
xf86_input_wacom = callPackage ../os-specific/linux/xf86-input-wacom { };
+ xf86_video_nouveau = callPackage ../os-specific/linux/xf86-video-nouveau {
+ inherit (xorg) xorgserver xproto fontsproto xf86driproto renderproto
+ videoproto utilmacros;
+ };
+
xmoto = builderDefsPackage (import ../games/xmoto) {
inherit chipmunk sqlite curl zlib bzip2 libjpeg libpng
freeglut mesa SDL SDL_mixer SDL_image SDL_net SDL_ttf
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
