summary refs log tree commit diff
path: root/pkgs/applications/misc/krusader
diff options
context:
space:
mode:
authorYury G. Kudryashov <urkud.urkud@gmail.com>2010-10-11 19:59:17 +0000
committerYury G. Kudryashov <urkud.urkud@gmail.com>2010-10-11 19:59:17 +0000
commit4aa443bd0f80384e621a277251186ef6fba9f1ad (patch)
tree2baf8eb3a723fa43819dd99c5228c5670c801e16 /pkgs/applications/misc/krusader
parent48229f2b0d79cb30fa0cebeb80dfdab0bdd781dd (diff)
downloadnixpkgs-4aa443bd0f80384e621a277251186ef6fba9f1ad.tar
nixpkgs-4aa443bd0f80384e621a277251186ef6fba9f1ad.tar.gz
nixpkgs-4aa443bd0f80384e621a277251186ef6fba9f1ad.tar.bz2
nixpkgs-4aa443bd0f80384e621a277251186ef6fba9f1ad.tar.lz
nixpkgs-4aa443bd0f80384e621a277251186ef6fba9f1ad.tar.xz
nixpkgs-4aa443bd0f80384e621a277251186ef6fba9f1ad.tar.zst
nixpkgs-4aa443bd0f80384e621a277251186ef6fba9f1ad.zip
Upgrade krusader to 2.2.0-beta1. 2.0.0 fails to compile with new qt
svn path=/nixpkgs/trunk/; revision=24223
Diffstat (limited to 'pkgs/applications/misc/krusader')
-rw-r--r--pkgs/applications/misc/krusader/default.nix15
1 files changed, 7 insertions, 8 deletions
diff --git a/pkgs/applications/misc/krusader/default.nix b/pkgs/applications/misc/krusader/default.nix
index 9e9c04acab2..3286c8addb3 100644
--- a/pkgs/applications/misc/krusader/default.nix
+++ b/pkgs/applications/misc/krusader/default.nix
@@ -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 ];
   };
 }