Merge pull request #5144 from matejc/rekonqwrapper

rekonq: update to rekonq-2.4.2 and add wrapper
This commit is contained in:
Domen Kožar 2014-11-27 09:55:36 +01:00
commit 81acb400b9
2 changed files with 7 additions and 3 deletions

View file

@ -3,11 +3,11 @@
assert builtins.compareVersions "4.8.3" kde4.release != 1; # https://bugs.kde.org/show_bug.cgi?id=306077
stdenv.mkDerivation rec {
name = "rekonq-1.80"; # >=1.80 need kde >=4.9.0
name = "rekonq-2.4.2"; # >=1.80 need kde >=4.9.0
src = fetchurl {
url = "mirror://sourceforge/rekonq/${name}.tar.bz2";
sha256 = "1lzmg8psy1j1v8vrmsyw609jv9scgnigdivx97fb4spb7x6sxn4g";
url = "mirror://sourceforge/rekonq/${name}.tar.xz";
sha256 = "09jihyf4xl7bwfwahwwbx6f11h3zqljccchnpl4mijljylr5p079";
};
buildInputs = [ kde4.kdelibs qca2 qoauth ];

View file

@ -12686,6 +12686,10 @@ let
{ browser = vimprobable2; browserName = "vimprobable2"; desktopName = "Vimprobable2";
};
rekonqWrapper = wrapFirefox {
browser = kde4.rekonq; browserName = "rekonq"; desktopName = "Rekonq";
};
vimb = callPackage ../applications/networking/browsers/vimb {
webkit = webkitgtk2;
};