mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 23:03:40 +01:00
merkaartor: 0.17.2
svn path=/nixpkgs/trunk/; revision=27180
This commit is contained in:
parent
bfffc57cc6
commit
7064b9f661
2 changed files with 9 additions and 11 deletions
|
@ -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;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue