public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

conkeror: upgrade to 141017 and use firefox for xulrunner

Browse Source
This commit is contained in:
Mathijs Kwik 2014-10-22 17:56:01 +02:00
parent cddc7382ef
commit 98015ee5ba
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/networking/browsers/conkeror/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchgit, unzip, xulrunner, makeWrapper }: { stdenv, fetchgit, unzip, firefox, makeWrapper }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "conkeror-1.0pre-20140616"; name = "conkeror-1.0pre-20140616";
src = fetchgit { src = fetchgit {
url = git://repo.or.cz/conkeror.git; url = git://repo.or.cz/conkeror.git;
rev = "8a26fff5896a3360549e2adfbf06b1d57e909266"; rev = "98e89c7e5ff3a1069a0984338da01273cdb189a2";
sha256 = "56f1c71ca1753a63d7599d3e8bf52277711b2693e7709ed7c146f34940441cb4"; sha256 = "284ba966efebfa0aaa768abc1a4f901e2ecf5db9d0391d904a49118b0b94fcd7";
}; };
buildInputs = [ unzip makeWrapper ]; buildInputs = [ unzip makeWrapper ];
@ -15,8 +15,8 @@ stdenv.mkDerivation {
mkdir -p $out/libexec/conkeror mkdir -p $out/libexec/conkeror
cp -r * $out/libexec/conkeror cp -r * $out/libexec/conkeror
makeWrapper ${xulrunner}/bin/xulrunner $out/bin/conkeror \ makeWrapper ${firefox}/bin/firefox $out/bin/conkeror \
--add-flags $out/libexec/conkeror/application.ini --add-flags "-app $out/libexec/conkeror/application.ini"
''; '';
meta = { meta = {