From 8d1d247e027a85cdca28d8c54fa35c1473d7bb63 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 20 Mar 2012 16:29:22 +0000
Subject: [PATCH] Add nouveau xorg video driver

svn path=/nixpkgs/trunk/; revision=33300
---
 .../linux/xf86-video-nouveau/default.nix      | 41 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  5 +++
 2 files changed, 46 insertions(+)
 create mode 100644 pkgs/os-specific/linux/xf86-video-nouveau/default.nix

diff --git a/pkgs/os-specific/linux/xf86-video-nouveau/default.nix b/pkgs/os-specific/linux/xf86-video-nouveau/default.nix
new file mode 100644
index 000000000000..e92b7f8003d8
--- /dev/null
+++ b/pkgs/os-specific/linux/xf86-video-nouveau/default.nix
@@ -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 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e67e654dfa82..fb88ba19bbc3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6082,6 +6082,11 @@ let
 
   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