Unverified Commit 6ecb24e2 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #213220 from sikmir/osm2pgsql 

osm2pgsql: 1.7.2 → 1.8.0
parents 6e90058e 1b11f07b

pkgs/tools/misc/osm2pgsql/default.nix

+3 −4
Original line number Diff line number Diff line
@@ -19,13 +19,13 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "osm2pgsql";

  version = "1.7.2";

  version = "1.8.0";



  src = fetchFromGitHub {

    owner = "openstreetmap";

    repo = "osm2pgsql";

    rev = finalAttrs.version;

    hash = "sha256-KJkqzvsm0IMaqeKnIbLGeOSJrsLvW+z7lCg6NbuU13g=";

    hash = "sha256-v+/pT8HnLoeeYe33v4xUoR5YWD/jHgEG/Q11Trw9X2s=";

  };



  postPatch = ''
@@ -35,14 +35,13 @@ stdenv.mkDerivation (finalAttrs: { 


  nativeBuildInputs = [ cmake ];



  buildInputs = [ expat fmt proj bzip2 zlib boost postgresql libosmium protozero rapidjson ]

  buildInputs = [ expat fmt proj bzip2 zlib boost postgresql libosmium protozero ]

    ++ lib.optional withLuaJIT luajit

    ++ lib.optional (!withLuaJIT) lua;



  cmakeFlags = [

    "-DEXTERNAL_LIBOSMIUM=ON"

    "-DEXTERNAL_PROTOZERO=ON"

    "-DEXTERNAL_RAPIDJSON=ON"

    "-DEXTERNAL_FMT=ON"

  ] ++ lib.optional withLuaJIT "-DWITH_LUAJIT:BOOL=ON";