diff options
author | Daniƫl de Kok <me@danieldk.eu> | 2020-06-29 08:22:57 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-29 08:22:57 +0200 |
commit | bcdf475f945ba1e226ee33bd2d5f405d63ca5db5 (patch) | |
tree | 520f27331ec6eb8939f435a703597cce6e71b923 /pkgs/tools/misc/osm2pgsql | |
parent | 7419b8dacc28ceb97fd7f327dd05c966ca744da6 (diff) | |
parent | 928faf2b6356599c7bbb862ae8f5a22fb4f5d840 (diff) |
Merge pull request #91743 from das-g/osm2pgsql-with-libs-from-nixpkgs
osm2pgsql: use libs from NixPkgs instead of vendored ones
Diffstat (limited to 'pkgs/tools/misc/osm2pgsql')
-rw-r--r-- | pkgs/tools/misc/osm2pgsql/default.nix | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/pkgs/tools/misc/osm2pgsql/default.nix b/pkgs/tools/misc/osm2pgsql/default.nix index af4bf80aac2ee..b2b665151686b 100644 --- a/pkgs/tools/misc/osm2pgsql/default.nix +++ b/pkgs/tools/misc/osm2pgsql/default.nix @@ -1,5 +1,18 @@ -{ stdenv, fetchFromGitHub, cmake, expat, proj, bzip2, zlib, boost, postgresql -, withLuaJIT ? false, lua, luajit }: +{ stdenv +, fetchFromGitHub +, cmake +, expat +, proj +, bzip2 +, zlib +, boost +, postgresql +, withLuaJIT ? false +, lua +, luajit +, libosmium +, protozero +}: stdenv.mkDerivation rec { pname = "osm2pgsql"; @@ -14,11 +27,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ expat proj bzip2 zlib boost postgresql ] + buildInputs = [ expat proj bzip2 zlib boost postgresql libosmium protozero ] ++ stdenv.lib.optional withLuaJIT luajit ++ stdenv.lib.optional (!withLuaJIT) lua; - cmakeFlags = stdenv.lib.optional withLuaJIT "-DWITH_LUAJIT:BOOL=ON"; + cmakeFlags = [ "-DEXTERNAL_LIBOSMIUM=ON" "-DEXTERNAL_PROTOZERO=ON" ] + ++ stdenv.lib.optional withLuaJIT "-DWITH_LUAJIT:BOOL=ON"; NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"; @@ -27,6 +41,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/openstreetmap/osm2pgsql"; license = licenses.gpl2; platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ jglukasik ]; + maintainers = with maintainers; [ jglukasik das-g ]; }; } |