From d9504f9aabccb6827c1f6bd9f7c697caf14c6323 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 11 Jul 2019 05:00:14 -0700 Subject: [PATCH] openorienteering-mapper: fix build --- pkgs/applications/gis/openorienteering-mapper/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/gis/openorienteering-mapper/default.nix b/pkgs/applications/gis/openorienteering-mapper/default.nix index a5a0492ab87..b4d3e9f93a4 100644 --- a/pkgs/applications/gis/openorienteering-mapper/default.nix +++ b/pkgs/applications/gis/openorienteering-mapper/default.nix @@ -20,9 +20,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ - # Required by the build to be specified - "-DPROJ4_ROOT=${proj}" - # Building the manual and bundling licenses fails "-DLICENSING_PROVIDER:BOOL=OFF" "-DMapper_MANUAL_QTHELP:BOOL=OFF" @@ -43,6 +40,8 @@ stdenv.mkDerivation rec { "-DMapper_PACKAGE_GDAL=0" ]); + # Needs to be available when proj_api.h gets evaluted by CPP + NIX_CFLAGS_COMPILE = [ "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" ]; postInstall = stdenv.lib.optionalString stdenv.isDarwin ''