From 7064b9f66135469f36d1bf7ccc20d849215b52c7 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sun, 8 May 2011 09:35:37 +0000
Subject: [PATCH] merkaartor: 0.17.2

svn path=/nixpkgs/trunk/; revision=27180
---
 pkgs/applications/misc/merkaartor/default.nix | 16 ++++++++--------
 pkgs/top-level/all-packages.nix               |  4 +---
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix
index 4c29855da07a..c14fdd84a6b8 100644
--- a/pkgs/applications/misc/merkaartor/default.nix
+++ b/pkgs/applications/misc/merkaartor/default.nix
@@ -1,23 +1,23 @@
-{stdenv, fetchurl, qt, boost}:
+{stdenv, fetchurl, qt4, boost}:
 
-stdenv.mkDerivation {
-  name = "merkaartor-0.16.0";
+stdenv.mkDerivation rec {
+  name = "merkaartor-0.17.2";
   src = fetchurl {
-    url = http://www.merkaartor.org/downloads/source/merkaartor-0.16.0.tar.bz2;
-    sha256 = "0l33vgwwkqj65i86qq5j33bbf6q02hs8r1frjnd7icqdaqqv08d7";
+    url = "http://www.merkaartor.org/downloads/source/${name}.tar.bz2";
+    sha256 = "0akhp9czzn39132mgj9h38nlh4l9ibzn3vh93bfs685zxyn4yps2";
   };
 
   configurePhase = ''
     qmake -makefile PREFIX=$out
   '';
 
-  buildInputs = [ qt boost ];
+  buildInputs = [ qt4 boost ];
 
   meta = {
     description = "An openstreetmap editor";
     homepage = http://merkaartor.org/;
     license = "GPLv2+";
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = qt.meta.platforms;
+    maintainers = with stdenv.lib.maintainers; [viric urkud];
+    inherit (qt4.meta) platforms;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 837de313fbf4..2bfa5038ee1a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6527,9 +6527,7 @@ let
     inherit (pythonPackages) ssl;
   };
 
-  merkaartor = callPackage ../applications/misc/merkaartor {
-    qt = qt4;
-  };
+  merkaartor = callPackage ../applications/misc/merkaartor { };
 
   meshlab = callPackage ../applications/graphics/meshlab {
     qt = qt4;