mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-19 12:11:28 +00:00
Merge pull request #116169 from sikmir/oomapper
openorienteering-mapper: 0.9.4 → 0.9.5
This commit is contained in:
commit
2e38cbe858
|
@ -1,6 +1,7 @@
|
|||
{ lib, stdenv
|
||||
, mkDerivation
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, substituteAll
|
||||
, gdal
|
||||
, cmake
|
||||
|
@ -19,7 +20,7 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "OpenOrienteering-Mapper";
|
||||
version = "0.9.4";
|
||||
version = "0.9.5";
|
||||
|
||||
buildInputs = [
|
||||
gdal
|
||||
|
@ -38,14 +39,21 @@ mkDerivation rec {
|
|||
owner = "OpenOrienteering";
|
||||
repo = "mapper";
|
||||
rev = "v${version}";
|
||||
sha256 = "13k9dirqm74lknhr8w121zr1hjd9gm1y73cj4rrj98rx44dzmk7b";
|
||||
sha256 = "1w8ikqpgi0ksrzjal5ihfaik4grc5v3gdnnv79j20xkr2p4yn1h5";
|
||||
};
|
||||
|
||||
patches = (substituteAll {
|
||||
# See https://github.com/NixOS/nixpkgs/issues/86054
|
||||
src = ./fix-qttranslations-path.diff;
|
||||
inherit qttranslations;
|
||||
});
|
||||
patches = [
|
||||
# https://github.com/NixOS/nixpkgs/issues/86054
|
||||
(substituteAll {
|
||||
src = ./fix-qttranslations-path.diff;
|
||||
inherit qttranslations;
|
||||
})
|
||||
# https://github.com/OpenOrienteering/mapper/pull/1907
|
||||
(fetchpatch {
|
||||
url = "https://github.com/OpenOrienteering/mapper/commit/bc52aa567e90a58d6963b44d5ae1909f3f841508.patch";
|
||||
sha256 = "1bkckapzccn6k0ri6bgrr0nhis9498fnwj7b32s2ysym8zcg0355";
|
||||
})
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
# Building the manual and bundling licenses fails
|
||||
|
@ -81,7 +89,8 @@ mkDerivation rec {
|
|||
and provides a free alternative to the existing proprietary solution.
|
||||
'';
|
||||
homepage = "https://www.openorienteering.org/apps/mapper/";
|
||||
license = licenses.gpl3;
|
||||
changelog = "https://github.com/OpenOrienteering/mapper/releases/tag/v${version}";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
maintainers = with maintainers; [ mpickering sikmir ];
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue