diff options
author | Alyssa Ross <hi@alyssa.is> | 2022-12-06 19:57:55 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-02-08 13:48:30 +0000 |
commit | bf3aadfdd39aa197e18bade671fab6726349ffa4 (patch) | |
tree | 698567af766ed441d757b57a7b21e68d4a342a2b /nixpkgs/pkgs/development/libraries/libosmscout | |
parent | f4afc5a01d9539ce09e47494e679c51f80723d07 (diff) | |
parent | 99665eb45f58d959d2cb9e49ddb960c79d596f33 (diff) | |
download | nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.gz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.bz2 nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.lz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.xz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.zst nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.zip |
Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libosmscout')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/libosmscout/default.nix | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libosmscout/default.nix b/nixpkgs/pkgs/development/libraries/libosmscout/default.nix index 2f83963d205f..76a1ba534b71 100644 --- a/nixpkgs/pkgs/development/libraries/libosmscout/default.nix +++ b/nixpkgs/pkgs/development/libraries/libosmscout/default.nix @@ -1,18 +1,21 @@ -{ lib, mkDerivation, fetchgit, cmake, pkg-config -, marisa, qtlocation }: +{ lib, mkDerivation, fetchFromGitHub, cmake, pkg-config +, marisa, qttools, qtlocation }: mkDerivation rec { pname = "libosmscout"; - version = "2017.06.30"; + version = "2022.04.25"; - src = fetchgit { - url = "git://git.code.sf.net/p/libosmscout/code"; - rev = "0c0fde4d9803539c99911389bc918377a93f350c"; - sha256 = "1pa459h52kw88mvsdvkz83f4p35vvgsfy2qfjwcj61gj4y9d2rq4"; + src = fetchFromGitHub { + owner = "Framstag"; + repo = "libosmscout"; + rev = "4c3b28472864b8e9cdda80a05ec73ef22cb39323"; + sha256 = "sha256-Qe5TkF4BwlsEI7emC0gdc7SmS4QrSGLiO0QdjuJA09g="; }; + cmakeFlags = [ "-DOSMSCOUT_BUILD_TESTS=OFF" ]; + nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ marisa qtlocation ]; + buildInputs = [ marisa qttools qtlocation ]; meta = with lib; { description = "Simple, high-level interfaces for offline location and POI lokup, rendering and routing functionalities based on OpenStreetMap (OSM) data"; |