Add nixos-gui among the installer tools.

Add it as a default for the graphical profile.

svn path=/nixos/trunk/; revision=26960

gui/README

@@ -1,19 +1,16 @@
-This file should become a nix expression.
+This file should become a nix expression. (see modules/installer/tools/tools.nix)
 
 you need to:
-- download the latest jQuery from:
+- download the latest jQuery from and copy it to chrome/content:
-    http://jqueryjs.googlecode.com/files/jquery-1.3.2.js
+    http://code.jquery.com/jquery-1.5.2.js
-    SHA1 Checksum: f0b95e99225f314fbe37ccf6b74ce2f916c517de
 
 - install 'xulrunner' with nix:
-    nix-env -i xulrunner
+    nix-env -Ai nixpkgs_sys.firefox40Pkgs.xulrunner
 
-- install and add nix-intantiate in your path
+- make sure nixos-option in your path
 
 - have /etc/nixos/nixpkgs
 - have /etc/nixos/nixos
 
-
+run it:
-to run it, either:
+- xulrunner /etc/nixos/nixos/gui/application.ini -jsconsole
-- cd /etc/nixos/nixos/gui; ./nixos-gui
-- xulrunner /etc/nixos/nixos/gui/application.ini

gui/application.ini

@@ -8,15 +8,16 @@ Vendor=NixOS
 Name=NixOS-gui
 ;
 ; This field specifies your application's version.  This field is optional.
-Version=0.0
+Version=0.1
 ;
 ; This field specifies your application's build ID (timestamp).  This field is
 ; required.
-BuildID=20090925
+BuildID=20110424
 ;
 ; This field specifies a compact copyright notice for your application.  This
 ; field is optional.
 ;Copyright=
+
 ;
 ; This ID is just an example.  Every XUL app ought to have it's own unique ID.
 ; You can use the microsoft "guidgen" or "uuidgen" tools, or go on

gui/nixos-gui

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec xulrunner "./application.ini"

modules/installer/tools/tools.nix

@@ -1,10 +1,11 @@
 # This module generates nixos-install, nixos-rebuild,
 # nixos-hardware-scan, etc.
 
-{config, pkgs, ...}:
+{config, pkgs, modulesPath, ...}:
 
 let
   ### implementation
+  cfg = config.installer;
 
   makeProg = args: pkgs.substituteAll (args // {
     dir = "bin";
@@ -27,7 +28,7 @@ let
 
     inherit (pkgs) perl pathsFromGraph;
     nix = config.environment.nix;
-    nixpkgsURL = config.installer.nixpkgsURL;
+    nixpkgsURL = cfg.nixpkgsURL;
 
     nixClosure = pkgs.runCommand "closure"
       {exportReferencesGraph = ["refs" config.environment.nix];}
@@ -64,7 +65,7 @@ let
       inherit nixClosure nix;
 
       # TODO shell ?
-      nixpkgsURL = config.installer.nixpkgsURL;
+      nixpkgsURL = cfg.nixpkgsURL;
     };
 
     # see ./nixos-bootstrap-archive/README-BOOTSTRAP-NIXOS
@@ -90,7 +91,7 @@ let
     name = "nixos-hardware-scan";
     src = ./nixos-hardware-scan.pl;
     inherit (pkgs) perl;
-    profile = config.installer.installProfile;
+    profile = cfg.installProfile;
   };
 
   nixosOption = makeProg {
@@ -98,6 +99,23 @@ let
     src = ./nixos-option.sh;
   };
 
+  nixosGui = pkgs.xulrunnerWrapper {
+    launcher = "nixos-gui";
+    application = pkgs.stdenv.mkDerivation {
+      name = "nixos-gui";
+      buildCommand = ''
+        ensureDir $out
+        cp -r $source $out
+        cp $jquery $out/chrome/content/jquery-1.5.2.js
+      '';
+      sources = pkgs.lib.cleanSource "${modulesPath}/../gui";
+      jquery = pkgs.fetchurl {
+        url = http://code.jquery.com/jquery-1.5.2.min.js;
+        sha256 = "e2107c8ecdb479c36d822d82bda2a8caf4429ab2d2cf9f20d5c931f75275403c";
+      };
+    };
+  };
+
 in
 
 {
@@ -132,6 +150,15 @@ in
       '';
     };
 
+    installer.enableGraphicalTools = pkgs.lib.mkOption {
+      default = false;
+      type = with pkgs.lib.types; bool;
+      example = true;
+      description = ''
+        Enable the installation of graphical tools.
+      '';
+    };
+
   };
 
   config = {
@@ -146,7 +173,7 @@ in
 
          installer2.runInChroot
          installer2.nixosPrepareInstall
-      ];
+      ] ++ pkgs.lib.optional cfg.enableGraphicalTools nixosGui;
 
     system.build = {
       inherit nixosInstall nixosHardwareScan nixosOption;

modules/profiles/graphical.nix

@@ -13,4 +13,6 @@
     desktopManager.default = "kde4";
     desktopManager.kde4.enable = true;
   };
+
+  installer.enableGraphicalTools = true;
 }