summary refs log tree commit diff
path: root/pkgs/applications/networking/browsers/conkeror
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2011-10-07 09:26:03 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2011-10-07 09:26:03 +0000
commit79ab307dd761ee1aa48123b5c63917e861cf672f (patch)
tree38ecf7de2e7e7134d3a6804ee31c596d08f16fd2 /pkgs/applications/networking/browsers/conkeror
parente0c4e42d8cb0052b642f0e4b0a9654b7d31c775e (diff)
downloadnixlib-79ab307dd761ee1aa48123b5c63917e861cf672f.tar
nixlib-79ab307dd761ee1aa48123b5c63917e861cf672f.tar.gz
nixlib-79ab307dd761ee1aa48123b5c63917e861cf672f.tar.bz2
nixlib-79ab307dd761ee1aa48123b5c63917e861cf672f.tar.lz
nixlib-79ab307dd761ee1aa48123b5c63917e861cf672f.tar.xz
nixlib-79ab307dd761ee1aa48123b5c63917e861cf672f.tar.zst
nixlib-79ab307dd761ee1aa48123b5c63917e861cf672f.zip
* Fix Chatzilla (it doesn't work with recent Xulrunners).
* Get rid of xulrunnerWrapper.

svn path=/nixpkgs/trunk/; revision=29706
Diffstat (limited to 'pkgs/applications/networking/browsers/conkeror')
-rw-r--r--pkgs/applications/networking/browsers/conkeror/default.nix17
1 files changed, 13 insertions, 4 deletions
diff --git a/pkgs/applications/networking/browsers/conkeror/default.nix b/pkgs/applications/networking/browsers/conkeror/default.nix
index e9c1c926ba43..08196780143c 100644
--- a/pkgs/applications/networking/browsers/conkeror/default.nix
+++ b/pkgs/applications/networking/browsers/conkeror/default.nix
@@ -1,14 +1,23 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchurl, unzip, xulrunner, makeWrapper }:
+
 stdenv.mkDerivation {
   name = "conkeror-1.0pre-20110917";
+  
   src = fetchurl {
     url = http://repo.or.cz/w/conkeror.git/snapshot/9d1f522674379874e502545babe0c843f78fa43c.zip;
     sha256 = "1ga3d9rc3xfaxvjnhnar752q9ga897q9fck0864i7rh0w7xbrhx2";
   };
-  buildInputs = [ unzip ];
-  installPhase = ''
-    cp -v -r . $out
+  
+  buildInputs = [ unzip makeWrapper ];
+  
+  buildCommand = ''
+    mkdir -p $out/libexec/conkeror
+    unzip $src -d $out/libexec
+
+    makeWrapper ${xulrunner}/bin/xulrunner $out/bin/conkeror \
+      --add-flags $out/libexec/conkeror/application.ini
   '';
+
   meta = {
     description = "A keyboard-oriented, customizable, extensible web browser";
     longDescription = ''