dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

osm2pgsql: use libosmium from nixpkgs

Browse Source
This commit is contained in:
Raphael Borun Das Gupta 2020-06-29 00:21:06 +02:00 committed by Daniël de Kok
parent 056b0df2b6
commit 03f13ede61
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/misc/osm2pgsql/default.nix
View File

@ -10,6 +10,7 @@
, withLuaJIT ? false , withLuaJIT ? false
, lua , lua
, luajit , luajit
, libosmium
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -25,11 +26,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ]; 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 luajit
++ stdenv.lib.optional (!withLuaJIT) lua; ++ 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"; NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H";