ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2025-01-05 02:23:07 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #100258 from sikmir/mapper

Browse Source 
openorienteering-mapper: 0.9.3 -> 0.9.4
This commit is contained in:
Domen Kožar 2020-10-13 12:29:57 +02:00 committed by GitHub
commit 18d295cd19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/applications/gis/openorienteering-mapper/default.nix
View File

@ -1,6 +1,7 @@
{ stdenv { stdenv
, mkDerivation , mkDerivation
, fetchFromGitHub , fetchFromGitHub
, substituteAll
, gdal , gdal
, cmake , cmake
, ninja , ninja
@ -18,7 +19,7 @@
mkDerivation rec { mkDerivation rec {
pname = "OpenOrienteering-Mapper"; pname = "OpenOrienteering-Mapper";
version = "0.9.3"; version = "0.9.4";
buildInputs = [ buildInputs = [
gdal gdal
@ -37,18 +38,14 @@ mkDerivation rec {
owner = "OpenOrienteering"; owner = "OpenOrienteering";
repo = "mapper"; repo = "mapper";
rev = "v${version}"; rev = "v${version}";
sha256 = "05bliglpc8170px6k9lfrp9ylpnb2zf47gnjns9b2bif8dv8zq0l"; sha256 = "13k9dirqm74lknhr8w121zr1hjd9gm1y73cj4rrj98rx44dzmk7b";
}; };
patches = [ patches = (substituteAll {
# See https://github.com/NixOS/nixpkgs/issues/86054 # See https://github.com/NixOS/nixpkgs/issues/86054
./fix-qttranslations-path.diff src = ./fix-qttranslations-path.diff;
]; inherit qttranslations;
});
postPatch = ''
substituteInPlace src/util/translation_util.cpp \
--subst-var-by qttranslations ${qttranslations}
'';
cmakeFlags = [ cmakeFlags = [
# Building the manual and bundling licenses fails # Building the manual and bundling licenses fails

2
pkgs/top-level/all-packages.nix
View File

@ -22618,7 +22618,7 @@ in
openjump = callPackage ../applications/misc/openjump { }; openjump = callPackage ../applications/misc/openjump { };
openorienteering-mapper = libsForQt514.callPackage ../applications/gis/openorienteering-mapper { }; openorienteering-mapper = libsForQt5.callPackage ../applications/gis/openorienteering-mapper { };
openscad = libsForQt5.callPackage ../applications/graphics/openscad {}; openscad = libsForQt5.callPackage ../applications/graphics/openscad {};