diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-10-13 19:34:34 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-10-13 19:34:34 +0200 |
| commit | 9e1943edc03c14854295d47001c2b46d7d2472de (patch) | |
| tree | 3a7b08aa961782c4a8e77837e6532502c891bc5d /pkgs/applications/gis | |
| parent | aabcf2d8f52c68ad37d72bf80d90608831450af5 (diff) | |
| parent | c5a41da563485db7e34475321e22d45941de23d0 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/gis')
| -rw-r--r-- | pkgs/applications/gis/openorienteering-mapper/default.nix | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/pkgs/applications/gis/openorienteering-mapper/default.nix b/pkgs/applications/gis/openorienteering-mapper/default.nix index 540fa2718975..45c38b3e5732 100644 --- a/pkgs/applications/gis/openorienteering-mapper/default.nix +++ b/pkgs/applications/gis/openorienteering-mapper/default.nix @@ -1,6 +1,7 @@ { stdenv , mkDerivation , fetchFromGitHub +, substituteAll , gdal , cmake , ninja @@ -18,7 +19,7 @@ mkDerivation rec { pname = "OpenOrienteering-Mapper"; - version = "0.9.3"; + version = "0.9.4"; buildInputs = [ gdal @@ -37,18 +38,14 @@ mkDerivation rec { owner = "OpenOrienteering"; repo = "mapper"; rev = "v${version}"; - sha256 = "05bliglpc8170px6k9lfrp9ylpnb2zf47gnjns9b2bif8dv8zq0l"; + sha256 = "13k9dirqm74lknhr8w121zr1hjd9gm1y73cj4rrj98rx44dzmk7b"; }; - patches = [ + patches = (substituteAll { # See https://github.com/NixOS/nixpkgs/issues/86054 - ./fix-qttranslations-path.diff - ]; - - postPatch = '' - substituteInPlace src/util/translation_util.cpp \ - --subst-var-by qttranslations ${qttranslations} - ''; + src = ./fix-qttranslations-path.diff; + inherit qttranslations; + }); cmakeFlags = [ # Building the manual and bundling licenses fails |