summary refs log tree commit diff
path: root/gui
diff options
context:
space:
mode:
authorNicolas Pierron <nicolas.b.pierron@gmail.com>2011-04-25 01:03:57 +0000
committerNicolas Pierron <nicolas.b.pierron@gmail.com>2011-04-25 01:03:57 +0000
commit921231b555d3656d573401eba7b36b6868914ebc (patch)
tree1fd86089bb7ad33379e769586c8adec517676168 /gui
parent97b39bd17cb6d24e84fcab29a51fcafdbab6ee2c (diff)
downloadnixpkgs-921231b555d3656d573401eba7b36b6868914ebc.tar
nixpkgs-921231b555d3656d573401eba7b36b6868914ebc.tar.gz
nixpkgs-921231b555d3656d573401eba7b36b6868914ebc.tar.bz2
nixpkgs-921231b555d3656d573401eba7b36b6868914ebc.tar.lz
nixpkgs-921231b555d3656d573401eba7b36b6868914ebc.tar.xz
nixpkgs-921231b555d3656d573401eba7b36b6868914ebc.tar.zst
nixpkgs-921231b555d3656d573401eba7b36b6868914ebc.zip
Add nixos-gui among the installer tools.
Add it as a default for the graphical profile.

svn path=/nixos/trunk/; revision=26960
Diffstat (limited to 'gui')
-rw-r--r--gui/README17
-rw-r--r--gui/application.ini5
-rwxr-xr-xgui/nixos-gui3
3 files changed, 10 insertions, 15 deletions
diff --git a/gui/README b/gui/README
index 7eee9040e3f..c038314a0dc 100644
--- a/gui/README
+++ b/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:
-    http://jqueryjs.googlecode.com/files/jquery-1.3.2.js
-    SHA1 Checksum: f0b95e99225f314fbe37ccf6b74ce2f916c517de
+- download the latest jQuery from and copy it to chrome/content:
+    http://code.jquery.com/jquery-1.5.2.js
 
 - 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
 
-
-to run it, either:
-- cd /etc/nixos/nixos/gui; ./nixos-gui
-- xulrunner /etc/nixos/nixos/gui/application.ini
+run it:
+- xulrunner /etc/nixos/nixos/gui/application.ini -jsconsole
diff --git a/gui/application.ini b/gui/application.ini
index a832d9d285b..d2494a1a5cd 100644
--- a/gui/application.ini
+++ b/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
diff --git a/gui/nixos-gui b/gui/nixos-gui
deleted file mode 100755
index f7728147ad3..00000000000
--- a/gui/nixos-gui
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec xulrunner "./application.ini"