From 9fca36bfa350373fc0cd29de6ad49f1c607a96b9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 23 Feb 2011 19:06:14 +0000
Subject: [PATCH] * Add the Intel 5000/6000 firmwares to the installation
 media.

svn path=/nixos/trunk/; revision=26081
---
 modules/installer/scan/not-detected.nix        | 7 ++++++-
 modules/services/x11/desktop-managers/xfce.nix | 9 ++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/modules/installer/scan/not-detected.nix b/modules/installer/scan/not-detected.nix
index 3a4a7f40fc69..e5a53bc8a0f8 100644
--- a/modules/installer/scan/not-detected.nix
+++ b/modules/installer/scan/not-detected.nix
@@ -1,10 +1,15 @@
 # List all devices which are _not_ detected by nixos-hardware-scan.
 # Common devices are enabled by default.
-{config, pkgs, ...}:
+{ config, pkgs, ... }:
 
 with pkgs.lib;
 
 {
+  imports =
+    [ ../../hardware/network/intel-5000.nix
+      ../../hardware/network/intel-6000.nix
+    ];
+
   config = mkDefault {
     # Wireless card firmware
     networking.enableRT73Firmware = true;
diff --git a/modules/services/x11/desktop-managers/xfce.nix b/modules/services/x11/desktop-managers/xfce.nix
index 4e8689f7ca71..dc502ccadb1d 100644
--- a/modules/services/x11/desktop-managers/xfce.nix
+++ b/modules/services/x11/desktop-managers/xfce.nix
@@ -7,6 +7,13 @@ let
   xcfg = config.services.xserver;
   cfg = xcfg.desktopManager.xfce;
 
+  fakeXfdesktop = pkgs.runCommand "xfdesktop" {}
+    ''
+      mkdir -p $out/bin
+      echo 'true' > $out/bin/xfdesktop
+      chmod u+x $out/bin/xfdesktop
+    '';
+
 in
 
 {
@@ -43,7 +50,7 @@ in
       };
 
     environment.systemPackages =
-      [
+      [ fakeXfdesktop
         pkgs.gtkLibs.gtk # To get GTK+'s themes.
         pkgs.hicolor_icon_theme
         pkgs.shared_mime_info