Author: urkud
Date: Mon Oct 11 19:59:17 2010
New Revision: 24223
URL: https://svn.nixos.org/websvn/nix/?rev=24223&sc=1
Log:
Upgrade krusader to 2.2.0-beta1. 2.0.0 fails to compile with new qt
Modified:
nixpkgs/trunk/pkgs/applications/misc/krusader/default.nix
Modified: nixpkgs/trunk/pkgs/applications/misc/krusader/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/misc/krusader/default.nix Mon Oct 11
19:30:54 2010 (r24222)
+++ nixpkgs/trunk/pkgs/applications/misc/krusader/default.nix Mon Oct 11
19:59:17 2010 (r24223)
@@ -1,17 +1,16 @@
-{stdenv, fetchurl, lib, cmake, qt4, perl, gettext, kdelibs, automoc4, phonon}:
+{stdenv, fetchurl, cmake, qt4, perl, gettext, kdelibs, kdebase, automoc4,
phonon}:
-stdenv.mkDerivation {
- name = "krusader-2.0.0";
+stdenv.mkDerivation rec {
+ name = "krusader-2.2.0-beta1";
src = fetchurl {
- url = mirror://sourceforge/krusader/krusader-2.0.0.tar.gz;
- sha256 =
"dc74c47d6eaf1c28165a74750e5a1b0341fa1c0d436658d0d5f85a6149f4852c";
+ url = "mirror://sourceforge/krusader/${name}.tar.bz2";
+ sha256 = "0rbk0hw8p1bb03w74gspljbzhvpbs3dcr6ckp38gh5r80mcmqfbs";
};
- buildInputs = [ cmake qt4 perl gettext kdelibs automoc4 phonon ];
- patches = [./krusader-gcc44.patch];
+ buildInputs = [ cmake qt4 perl gettext kdelibs automoc4 phonon kdebase ];
meta = {
description = "Norton/Total Commander clone for KDE";
license = "GPL";
homepage = http://www.krusader.org;
- maintainers = [ lib.maintainers.sander ];
+ maintainers = with stdenv.lib.maintainers; [ sander urkud ];
};
}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
