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

Upgrade rekonq 

svn path=/nixpkgs/trunk/; revision=22835
This commit is contained in:
Yury G. Kudryashov 2010-07-31 13:06:10 +00:00
parent 288c414bb4
commit 45fd5a9836
3 changed files with 21 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/applications/networking/browsers/rekonq/default.nix
View File

@ -1,10 +1,15 @@
{ stdenv, fetchurl, fetchgit, cmake, qt4, kdelibs, automoc4, phonon, perl { stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, perl
, v ? "0.4.90" }: , gtk, gettext, pixman}:
stdenv.mkDerivation ( stdenv.mkDerivation rec {
builtins.getAttr v (import ./source.nix { inherit fetchurl fetchgit; }) name = "rekonq-0.5.0";
// {
buildInputs = [ cmake qt4 kdelibs automoc4 phonon perl ]; 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; { meta = with stdenv.lib; {
platforms = platforms.linux; platforms = platforms.linux;
@ -13,4 +18,3 @@ stdenv.mkDerivation (
homepage = http://rekonq.sourceforge.net; homepage = http://rekonq.sourceforge.net;
}; };
} }
)

28
pkgs/applications/networking/browsers/rekonq/source.nix
View File

@ -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";
};
};
}
]

4
pkgs/top-level/all-packages.nix
View File

@ -8717,7 +8717,9 @@ let
}; };
rekonq = makeOverridable (import ../applications/networking/browsers/rekonq) { 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; inherit (kde4) qt4 kdelibs automoc4 phonon;
}; };