diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
| commit | 99fcaeccb89621dd492203ce1f2d551c06f228ed (patch) | |
| tree | 41cb730ae07383004789779b0f6e11cb3f4642a3 /nixpkgs/pkgs/development/libraries/readosm | |
| parent | 59c5f5ac8682acc13bb22bc29c7cf02f7d75f01f (diff) | |
| parent | 75a5ebf473cd60148ba9aec0d219f72e5cf52519 (diff) | |
| download | nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.gz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.bz2 nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.lz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.xz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.zst nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/nixos/modules/config/console.nix nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix nixpkgs/pkgs/applications/networking/irc/weechat/default.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/interpreters/python/default.nix nixpkgs/pkgs/development/node-packages/overrides.nix nixpkgs/pkgs/development/tools/b4/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix nixpkgs/pkgs/servers/mail/public-inbox/default.nix nixpkgs/pkgs/tools/security/pinentry/default.nix nixpkgs/pkgs/tools/text/unoconv/default.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/readosm')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/readosm/default.nix | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/development/libraries/readosm/default.nix b/nixpkgs/pkgs/development/libraries/readosm/default.nix index f177dc768a69..8ba1f571b028 100644 --- a/nixpkgs/pkgs/development/libraries/readosm/default.nix +++ b/nixpkgs/pkgs/development/libraries/readosm/default.nix @@ -1,24 +1,26 @@ -{ lib, stdenv, fetchurl, expat, zlib, geos, libspatialite }: +{ lib, stdenv, fetchurl, expat, zlib, validatePkgConfig }: stdenv.mkDerivation rec { pname = "readosm"; version = "1.1.0a"; src = fetchurl { - url = "https://www.gaia-gis.it/gaia-sins/readosm-sources/${pname}-${version}.tar.gz"; - sha256 = "0igif2bxf4dr82glxz9gyx5mmni0r2dsnx9p9k6pxv3c4lfhaz6v"; + url = "https://www.gaia-gis.it/gaia-sins/readosm-${version}.tar.gz"; + hash = "sha256-23wFHSVs7H7NTDd1q5vIINpaS/cv/U6fQLkR15dw8UU="; }; - buildInputs = [ expat zlib geos libspatialite ]; + nativeBuildInputs = [ validatePkgConfig ]; - configureFlags = [ "--disable-freexl" ]; + buildInputs = [ expat zlib ]; enableParallelBuilding = true; - meta = { + doCheck = true; + + meta = with lib; { description = "An open source library to extract valid data from within an Open Street Map input file"; homepage = "https://www.gaia-gis.it/fossil/readosm"; - license = with lib.licenses; [ mpl11 gpl2Plus lgpl21Plus ]; - platforms = lib.platforms.linux; + license = with licenses; [ mpl11 gpl2Plus lgpl21Plus ]; + platforms = platforms.unix; }; } |