Author: viric Date: 2010-06-13 19:32:04 +0000 (Sun, 13 Jun 2010) New Revision: 22244
You can view the changes in this commit at: https://svn.nixos.org/viewvc/nix?rev=22244&view=rev Added: nixpkgs/trunk/pkgs/applications/misc/merkaartor/ nixpkgs/trunk/pkgs/applications/misc/merkaartor/default.nix Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix Log: Adding merkaartor (a qt-based openstreetmap editor) Changes: Added: nixpkgs/trunk/pkgs/applications/misc/merkaartor/default.nix =================================================================== --- nixpkgs/trunk/pkgs/applications/misc/merkaartor/default.nix (rev 0) +++ nixpkgs/trunk/pkgs/applications/misc/merkaartor/default.nix 2010-06-13 19:32:04 UTC (rev 22244) @@ -0,0 +1,23 @@ +{stdenv, fetchurl, qt, boost}: + +stdenv.mkDerivation { + name = "merkaartor-0.16.0"; + src = fetchurl { + url = http://www.merkaartor.org/downloads/source/merkaartor-0.16.0.tar.bz2; + sha256 = "0l33vgwwkqj65i86qq5j33bbf6q02hs8r1frjnd7icqdaqqv08d7"; + }; + + configurePhase = '' + qmake -makefile PREFIX=$out + ''; + + buildInputs = [ qt boost ]; + + meta = { + description = "An openstreetmap editor"; + homepage = http://merkaartor.org/; + license = "GPLv2+"; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; all; + }; +} Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix =================================================================== --- nixpkgs/trunk/pkgs/top-level/all-packages.nix 2010-06-13 16:28:34 UTC (rev 22243) +++ nixpkgs/trunk/pkgs/top-level/all-packages.nix 2010-06-13 19:32:04 UTC (rev 22244) @@ -8204,6 +8204,11 @@ else pythonBase; }; + merkaartor = import ../applications/misc/merkaartor { + inherit fetchurl stdenv boost; + qt = qt4; + }; + meshlab = import ../applications/graphics/meshlab { inherit fetchurl stdenv bzip2 lib3ds levmar muparser unzip; qt = qt4; _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
