Author: eelco
Date: Wed Feb 23 19:06:14 2011
New Revision: 26081
URL: https://svn.nixos.org/websvn/nix/?rev=26081&sc=1
Log:
* Add the Intel 5000/6000 firmwares to the installation media.
Modified:
nixos/trunk/modules/installer/scan/not-detected.nix
nixos/trunk/modules/services/x11/desktop-managers/xfce.nix
Modified: nixos/trunk/modules/installer/scan/not-detected.nix
==============================================================================
--- nixos/trunk/modules/installer/scan/not-detected.nix Wed Feb 23 17:36:36
2011 (r26080)
+++ nixos/trunk/modules/installer/scan/not-detected.nix Wed Feb 23 19:06:14
2011 (r26081)
@@ -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;
Modified: nixos/trunk/modules/services/x11/desktop-managers/xfce.nix
==============================================================================
--- nixos/trunk/modules/services/x11/desktop-managers/xfce.nix Wed Feb 23
17:36:36 2011 (r26080)
+++ nixos/trunk/modules/services/x11/desktop-managers/xfce.nix Wed Feb 23
19:06:14 2011 (r26081)
@@ -7,6 +7,13 @@
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 @@
};
environment.systemPackages =
- [
+ [ fakeXfdesktop
pkgs.gtkLibs.gtk # To get GTK+'s themes.
pkgs.hicolor_icon_theme
pkgs.shared_mime_info
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
