From 3553854f1297cd9ec0ab8b1acc47c10406ddf76d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 18 Sep 2021 17:10:32 -0700 Subject: [PATCH] osm2xmap: use proj7 --- pkgs/applications/misc/osm2xmap/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/osm2xmap/default.nix b/pkgs/applications/misc/osm2xmap/default.nix index 4f2af99ab14..f9f880050ed 100644 --- a/pkgs/applications/misc/osm2xmap/default.nix +++ b/pkgs/applications/misc/osm2xmap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libroxml, proj, libyamlcpp, boost } : +{ lib, stdenv, fetchFromGitHub, libroxml, proj_7, libyamlcpp, boost } : stdenv.mkDerivation rec { pname = "osm2xmap"; @@ -14,14 +14,14 @@ stdenv.mkDerivation rec { makeFlags = [ "GIT_VERSION=${version}" "GIT_TIMESTAMP=" - "SHAREDIR=${placeholder "out"}/share/osm2xmap" + "SHAREDIR=${placeholder "out"}/share/osm2xmap/" "INSTALL_BINDIR=${placeholder "out"}/bin" "INSTALL_MANDIR=${placeholder "out"}/share/man/man1" ]; NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"; - buildInputs = [ libroxml proj libyamlcpp boost ]; + buildInputs = [ libroxml proj_7 libyamlcpp boost ]; meta = with lib; { homepage = "https://github.com/sembruk/osm2xmap";