mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-22 03:53:47 +00:00
osm2pgsql: 1.7.2 → 1.8.0
This commit is contained in:
parent
1066f160eb
commit
1b11f07b58
@ -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";
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user