summary refs log tree commit diff
path: root/pkgs/applications/misc
diff options
context:
space:
mode:
authorYury G. Kudryashov <urkud.urkud@gmail.com>2011-05-08 09:35:37 +0000
committerYury G. Kudryashov <urkud.urkud@gmail.com>2011-05-08 09:35:37 +0000
commit7064b9f66135469f36d1bf7ccc20d849215b52c7 (patch)
treeca0ab568946559c5fdda832a5c3d423f31828295 /pkgs/applications/misc
parentbfffc57cc61e1fb2a5ae06ae75d30b9fb387a6f1 (diff)
downloadnixpkgs-7064b9f66135469f36d1bf7ccc20d849215b52c7.tar
nixpkgs-7064b9f66135469f36d1bf7ccc20d849215b52c7.tar.gz
nixpkgs-7064b9f66135469f36d1bf7ccc20d849215b52c7.tar.bz2
nixpkgs-7064b9f66135469f36d1bf7ccc20d849215b52c7.tar.lz
nixpkgs-7064b9f66135469f36d1bf7ccc20d849215b52c7.tar.xz
nixpkgs-7064b9f66135469f36d1bf7ccc20d849215b52c7.tar.zst
nixpkgs-7064b9f66135469f36d1bf7ccc20d849215b52c7.zip
merkaartor: 0.17.2
svn path=/nixpkgs/trunk/; revision=27180
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r--pkgs/applications/misc/merkaartor/default.nix16
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix
index 4c29855da07..c14fdd84a6b 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;
   };
 }