public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merkaartor: 0.17.2

Browse Source 
svn path=/nixpkgs/trunk/; revision=27180
This commit is contained in:
Yury G. Kudryashov 2011-05-08 09:35:37 +00:00
parent bfffc57cc6
commit 7064b9f661
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/applications/misc/merkaartor/default.nix
View File

@ -1,23 +1,23 @@
{stdenv, fetchurl, qt, boost}: {stdenv, fetchurl, qt4, boost}:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "merkaartor-0.16.0"; name = "merkaartor-0.17.2";
src = fetchurl { src = fetchurl {
url = http://www.merkaartor.org/downloads/source/merkaartor-0.16.0.tar.bz2; url = "http://www.merkaartor.org/downloads/source/${name}.tar.bz2";
sha256 = "0l33vgwwkqj65i86qq5j33bbf6q02hs8r1frjnd7icqdaqqv08d7"; sha256 = "0akhp9czzn39132mgj9h38nlh4l9ibzn3vh93bfs685zxyn4yps2";
}; };
configurePhase = '' configurePhase = ''
qmake -makefile PREFIX=$out qmake -makefile PREFIX=$out
''; '';
buildInputs = [ qt boost ]; buildInputs = [ qt4 boost ];
meta = { meta = {
description = "An openstreetmap editor"; description = "An openstreetmap editor";
homepage = http://merkaartor.org/; homepage = http://merkaartor.org/;
license = "GPLv2+"; license = "GPLv2+";
maintainers = with stdenv.lib.maintainers; [viric]; maintainers = with stdenv.lib.maintainers; [viric urkud];
platforms = qt.meta.platforms; inherit (qt4.meta) platforms;
}; };
} }

4
pkgs/top-level/all-packages.nix
View File

@ -6527,9 +6527,7 @@ let
inherit (pythonPackages) ssl; inherit (pythonPackages) ssl;
}; };
merkaartor = callPackage ../applications/misc/merkaartor { merkaartor = callPackage ../applications/misc/merkaartor { };
qt = qt4;
};
meshlab = callPackage ../applications/graphics/meshlab { meshlab = callPackage ../applications/graphics/meshlab {
qt = qt4; qt = qt4;