Author: urkud
Date: Sun May 8 09:35:37 2011
New Revision: 27180
URL: https://svn.nixos.org/websvn/nix/?rev=27180&sc=1
Log:
merkaartor: 0.17.2
Modified:
nixpkgs/trunk/pkgs/applications/misc/merkaartor/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/applications/misc/merkaartor/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/misc/merkaartor/default.nix Sun May 8
09:35:31 2011 (r27179)
+++ nixpkgs/trunk/pkgs/applications/misc/merkaartor/default.nix Sun May 8
09:35:37 2011 (r27180)
@@ -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;
};
}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun May 8 09:35:31
2011 (r27179)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun May 8 09:35:37
2011 (r27180)
@@ -6527,9 +6527,7 @@
inherit (pythonPackages) ssl;
};
- merkaartor = callPackage ../applications/misc/merkaartor {
- qt = qt4;
- };
+ merkaartor = callPackage ../applications/misc/merkaartor { };
meshlab = callPackage ../applications/graphics/meshlab {
qt = qt4;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
