From 49dd595e2d962b0be7962a805a844bbe8c2a005a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 7 Aug 2010 18:21:16 +0000
Subject: [PATCH] * Add some missing X.org packages to the channel.

svn path=/nixpkgs/trunk/; revision=23025
---
 pkgs/top-level/all-packages.nix | 2 ++
 pkgs/top-level/release.nix      | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7ebcc0336bf9..f973c8d8d8ee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6563,12 +6563,14 @@ let
   xfce = xfce4;
   xfce4 = recurseIntoAttrs (import ../desktops/xfce-4 pkgs);
 
+  
   ### SCIENCE
 
   xplanet = callPackage ../applications/science/xplanet {
     inherit (gtkLibs) pango;
   };
 
+  
   ### SCIENCE/GEOMETRY
 
   drgeo = builderDefsPackage (import ../applications/science/geometry/drgeo) {
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index e99c37eb771c..563df607aad4 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -539,22 +539,27 @@ with (import ./release-lib.nix);
     lndir = all;
     setxkbmap = linux;
     xauth = linux;
+    xbitmaps = linux;
     xev = linux;
+    xf86inputevdev = linux;
     xf86inputkeyboard = linux;
     xf86inputmouse = linux;
-    xf86inputevdev = linux;
     xf86inputsynaptics = linux;
     xf86videoati = linux;
+    xf86videocirrus = linux;
     xf86videointel = linux;
     xf86videonv = linux;
     xf86videovesa = linux;
     xfs = linux;
     xkbcomp = linux;
+    xlsclients = linux;
     xmessage = linux;
     xorgserver = linux;
+    xprop = linux;    
     xrandr = linux;
     xrdb = linux;
     xset = linux;
+    xsetroot = linux;
   };
 
 } ))