public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

osm2pgsql: use protozero from nixpkgs

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

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

@ -11,6 +11,7 @@
, lua , lua
, luajit , luajit
, libosmium , libosmium
, protozero
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -26,11 +27,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ expat proj bzip2 zlib boost postgresql libosmium ] buildInputs = [ expat proj bzip2 zlib boost postgresql libosmium protozero ]
++ stdenv.lib.optional withLuaJIT luajit ++ stdenv.lib.optional withLuaJIT luajit
++ stdenv.lib.optional (!withLuaJIT) lua; ++ stdenv.lib.optional (!withLuaJIT) lua;
cmakeFlags = [ "-DEXTERNAL_LIBOSMIUM=ON" ] cmakeFlags = [ "-DEXTERNAL_LIBOSMIUM=ON" "-DEXTERNAL_PROTOZERO=ON" ]
++ stdenv.lib.optional withLuaJIT "-DWITH_LUAJIT:BOOL=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";