diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-03-25 10:46:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-25 10:46:43 +0100 |
| commit | 2e38cbe8584e37dedcd1aebdd7859139be963091 (patch) | |
| tree | e49214249d1c53fab5423fd7030b7a2aadaf7acd /pkgs/applications/gis | |
| parent | b992a92fa04d43d67948b395cf57bc125135c388 (diff) | |
| parent | 0149eb8a42c29b20b4969de8aaa85e44bb335a9e (diff) | |
| download | nixpkgs-2e38cbe8584e37dedcd1aebdd7859139be963091.tar nixpkgs-2e38cbe8584e37dedcd1aebdd7859139be963091.tar.gz nixpkgs-2e38cbe8584e37dedcd1aebdd7859139be963091.tar.bz2 nixpkgs-2e38cbe8584e37dedcd1aebdd7859139be963091.tar.lz nixpkgs-2e38cbe8584e37dedcd1aebdd7859139be963091.tar.xz nixpkgs-2e38cbe8584e37dedcd1aebdd7859139be963091.tar.zst nixpkgs-2e38cbe8584e37dedcd1aebdd7859139be963091.zip | |
Merge pull request #116169 from sikmir/oomapper
openorienteering-mapper: 0.9.4 → 0.9.5
Diffstat (limited to 'pkgs/applications/gis')
| -rw-r--r-- | pkgs/applications/gis/openorienteering-mapper/default.nix | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/pkgs/applications/gis/openorienteering-mapper/default.nix b/pkgs/applications/gis/openorienteering-mapper/default.nix index 81e81c88537..21b4cfa94b1 100644 --- a/pkgs/applications/gis/openorienteering-mapper/default.nix +++ b/pkgs/applications/gis/openorienteering-mapper/default.nix @@ -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 ]; }; |