From 03f13ede6114c705564d49672c7580098dbfc9a1 Mon Sep 17 00:00:00 2001 From: Raphael Borun Das Gupta Date: Mon, 29 Jun 2020 00:21:06 +0200 Subject: [PATCH] osm2pgsql: use libosmium from nixpkgs --- pkgs/tools/misc/osm2pgsql/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/osm2pgsql/default.nix b/pkgs/tools/misc/osm2pgsql/default.nix index c7bd00aedbae..075eb5f4f78a 100644 --- a/pkgs/tools/misc/osm2pgsql/default.nix +++ b/pkgs/tools/misc/osm2pgsql/default.nix @@ -10,6 +10,7 @@ , withLuaJIT ? false , lua , luajit +, libosmium }: stdenv.mkDerivation rec { @@ -25,11 +26,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ expat proj bzip2 zlib boost postgresql ] + buildInputs = [ expat proj bzip2 zlib boost postgresql libosmium ] ++ stdenv.lib.optional withLuaJIT luajit ++ stdenv.lib.optional (!withLuaJIT) lua; - cmakeFlags = stdenv.lib.optional withLuaJIT "-DWITH_LUAJIT:BOOL=ON"; + cmakeFlags = [ "-DEXTERNAL_LIBOSMIUM=ON" ] + ++ stdenv.lib.optional withLuaJIT "-DWITH_LUAJIT:BOOL=ON"; NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H";