From deaa36da0c455be604ebc9e49e7088bfa9bbe397 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 11 Jul 2019 03:52:04 -0700 Subject: osm2xmap: fix build --- pkgs/applications/misc/osm2xmap/default.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs/applications/misc') diff --git a/pkgs/applications/misc/osm2xmap/default.nix b/pkgs/applications/misc/osm2xmap/default.nix index 5787adef2a3e..9d0fb3fdeb7c 100644 --- a/pkgs/applications/misc/osm2xmap/default.nix +++ b/pkgs/applications/misc/osm2xmap/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { "INSTALL_SHAREDIR=$(out)/share/" ]; + NIX_CFLAGS_COMPILE = [ "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" ]; + installFlags = [ "DESTDIR=$(out)" ]; buildInputs = [ libroxml proj libyamlcpp boost ]; -- cgit 1.4.1 From f34face72159d37bb3e65cca6caf84e93cef469f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 11 Jul 2019 04:58:46 -0700 Subject: merkaartor: fix build --- pkgs/applications/misc/merkaartor/default.nix | 2 ++ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'pkgs/applications/misc') diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix index 0833464f2c25..dec55e9c1e5c 100644 --- a/pkgs/applications/misc/merkaartor/default.nix +++ b/pkgs/applications/misc/merkaartor/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + NIX_CFLAGS_COMPILE = [ "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" ]; + postInstall = '' wrapProgram $out/bin/merkaartor \ --set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-*/plugins/platforms diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e75dd15fddd9..06c76e7a814e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19056,7 +19056,9 @@ in mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; }); - merkaartor = libsForQt59.callPackage ../applications/misc/merkaartor { }; + merkaartor = libsForQt59.callPackage ../applications/misc/merkaartor { + gdal = gdal_2; # https://github.com/openstreetmap/merkaartor/issues/179 + }; meshlab = libsForQt5.callPackage ../applications/graphics/meshlab { }; -- cgit 1.4.1