summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2007-02-26 23:10:25 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2007-02-26 23:10:25 +0000
commitba443448e80314d16a5eb843313e8c103ed33150 (patch)
tree6b02ceb8328b3e2101422d248ab451ad416a766e /pkgs/top-level
parent7edbaaaff2e0454a372be0482167f6377acfbb15 (diff)
downloadnixlib-ba443448e80314d16a5eb843313e8c103ed33150.tar
nixlib-ba443448e80314d16a5eb843313e8c103ed33150.tar.gz
nixlib-ba443448e80314d16a5eb843313e8c103ed33150.tar.bz2
nixlib-ba443448e80314d16a5eb843313e8c103ed33150.tar.lz
nixlib-ba443448e80314d16a5eb843313e8c103ed33150.tar.xz
nixlib-ba443448e80314d16a5eb843313e8c103ed33150.tar.zst
nixlib-ba443448e80314d16a5eb843313e8c103ed33150.zip
* Build the i810 driver. Only depend on the Mesa headers, not all of Mesa.
svn path=/nixpkgs/trunk/; revision=8060
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix7
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6795ca6ad314..3f41657d16a3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1575,6 +1575,11 @@ rec {
     inherit (xlibs) libXmu libXi;
   };
 
+  mesaHeaders = import ../development/libraries/mesa/headers.nix {
+    inherit stdenv;
+    mesaSrc = mesa.src;
+  };
+
   mpeg2dec = import ../development/libraries/mpeg2dec {
     inherit fetchurl stdenv;
   };
@@ -2097,7 +2102,7 @@ rec {
 
   xorg = recurseIntoAttrs (import ../servers/x11/xorg {
     inherit fetchurl stdenv pkgconfig freetype fontconfig
-      libxslt expat libdrm libpng zlib perl mesa;
+      libxslt expat libdrm libpng zlib perl mesa mesaHeaders;
   });