Author: urkud
Date: Sat Jul 31 13:06:10 2010
New Revision: 22835
URL: https://svn.nixos.org/websvn/nix/?rev=22835&sc=1
Log:
Upgrade rekonq
Deleted:
nixpkgs/trunk/pkgs/applications/networking/browsers/rekonq/source.nix
Modified:
nixpkgs/trunk/pkgs/applications/networking/browsers/rekonq/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/applications/networking/browsers/rekonq/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/networking/browsers/rekonq/default.nix
Sat Jul 31 13:05:58 2010 (r22834)
+++ nixpkgs/trunk/pkgs/applications/networking/browsers/rekonq/default.nix
Sat Jul 31 13:06:10 2010 (r22835)
@@ -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;
+ };
+}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Jul 31 13:05:58
2010 (r22834)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Jul 31 13:06:10
2010 (r22835)
@@ -8717,7 +8717,9 @@
};
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;
};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
