Merge pull request #5144 from matejc/rekonqwrapper

rekonq: update to rekonq-2.4.2 and add wrapper

+7 -3
+3 -3
pkgs/applications/networking/browsers/rekonq/default.nix
··· 3 3 assert builtins.compareVersions "4.8.3" kde4.release != 1; # https://bugs.kde.org/show_bug.cgi?id=306077 4 4 5 5 stdenv.mkDerivation rec { 6 - name = "rekonq-1.80"; # >=1.80 need kde >=4.9.0 6 + name = "rekonq-2.4.2"; # >=1.80 need kde >=4.9.0 7 7 8 8 src = fetchurl { 9 - url = "mirror://sourceforge/rekonq/${name}.tar.bz2"; 10 - sha256 = "1lzmg8psy1j1v8vrmsyw609jv9scgnigdivx97fb4spb7x6sxn4g"; 9 + url = "mirror://sourceforge/rekonq/${name}.tar.xz"; 10 + sha256 = "09jihyf4xl7bwfwahwwbx6f11h3zqljccchnpl4mijljylr5p079"; 11 11 }; 12 12 13 13 buildInputs = [ kde4.kdelibs qca2 qoauth ];
+4
pkgs/top-level/all-packages.nix
··· 12686 12686 { browser = vimprobable2; browserName = "vimprobable2"; desktopName = "Vimprobable2"; 12687 12687 }; 12688 12688 12689 + rekonqWrapper = wrapFirefox { 12690 + browser = kde4.rekonq; browserName = "rekonq"; desktopName = "Rekonq"; 12691 + }; 12692 + 12689 12693 vimb = callPackage ../applications/networking/browsers/vimb { 12690 12694 webkit = webkitgtk2; 12691 12695 };