diff --git a/pkgs/applications/networking/browsers/rekonq/default.nix b/pkgs/applications/networking/browsers/rekonq/default.nix index fc6c5c0013a..60f2162a26a 100644 --- a/pkgs/applications/networking/browsers/rekonq/default.nix +++ b/pkgs/applications/networking/browsers/rekonq/default.nix @@ -1,16 +1,20 @@ -{ stdenv, fetchurl, fetchgit, cmake, qt4, kdelibs, automoc4, phonon, perl -, v ? "0.4.90" }: +{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, perl +, gtk, gettext, pixman}: -stdenv.mkDerivation ( - builtins.getAttr v (import ./source.nix { inherit fetchurl fetchgit; }) - // { - buildInputs = [ cmake qt4 kdelibs automoc4 phonon perl ]; +stdenv.mkDerivation rec { + name = "rekonq-0.5.0"; - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = [ maintainers.urkud ]; - description = "KDE Webkit browser"; - homepage = http://rekonq.sourceforge.net; - }; - } -) + src = fetchurl { + url = "mirror://sf/rekonq/${name}.tar.bz2"; + sha256 = "0qm16ivxlh3pj7v39z3ajf90sgm5q5xq6a8s2x1a0ipsh7fgkp58"; + }; + + buildInputs = [ cmake qt4 kdelibs automoc4 phonon perl gtk gettext pixman ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = [ maintainers.urkud ]; + description = "KDE Webkit browser"; + homepage = http://rekonq.sourceforge.net; + }; +} diff --git a/pkgs/applications/networking/browsers/rekonq/source.nix b/pkgs/applications/networking/browsers/rekonq/source.nix deleted file mode 100644 index 5faeddaaf2a..00000000000 --- a/pkgs/applications/networking/browsers/rekonq/source.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ fetchurl, fetchgit }: - -builtins.listToAttrs -[ - { - name = "0.4.90"; - value = rec { - name = "rekonq-0.4.90"; - src = fetchurl { - url = "http://kde-apps.org/CONTENT/content-files/94258-${name}.tar.bz2"; - name = "${name}.tar.bz2"; - sha256 = "1dmdx54asv0b4xzc8p5nadn92l8pks9cl1y9j8a46lsslwsjw3ws"; - }; - }; - } - - { - name = "scm"; - value = { - name = "rekonq-0.4.0-20100514"; - src = fetchgit { - url = git://gitorious.org/rekonq/mainline.git; - rev = "6b4f4d69a3c599bc958ccddc5f7ac1c8648a7042"; - sha256 = "1qcwf7rsrnsbnq62cl44r48bmavc2nysi2wqhy1jxmj2ndwvsxy1"; - }; - }; - } -] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 905657f89e2..65ca4558ff5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8717,7 +8717,9 @@ let }; rekonq = makeOverridable (import ../applications/networking/browsers/rekonq) { - inherit fetchurl fetchgit stdenv cmake perl; + inherit fetchurl stdenv cmake perl gettext; + inherit (gtkLibs) gtk; + inherit (xlibs) pixman; inherit (kde4) qt4 kdelibs automoc4 phonon; };