diff options
| author | Nikolay Korotkiy <sikmir@gmail.com> | 2020-10-06 20:28:16 +0300 |
|---|---|---|
| committer | Nikolay Korotkiy <sikmir@gmail.com> | 2020-10-11 20:39:59 +0300 |
| commit | f637dd34f6eb956142b71261f9a53e843d148741 (patch) | |
| tree | f85765d631ed2c9e3c51fe211640166e93942c84 | |
| parent | 24c9b05ac53e422f1af81a156f1fd58499eb27fb (diff) | |
| download | nixpkgs-f637dd34f6eb956142b71261f9a53e843d148741.tar nixpkgs-f637dd34f6eb956142b71261f9a53e843d148741.tar.gz nixpkgs-f637dd34f6eb956142b71261f9a53e843d148741.tar.bz2 nixpkgs-f637dd34f6eb956142b71261f9a53e843d148741.tar.lz nixpkgs-f637dd34f6eb956142b71261f9a53e843d148741.tar.xz nixpkgs-f637dd34f6eb956142b71261f9a53e843d148741.tar.zst nixpkgs-f637dd34f6eb956142b71261f9a53e843d148741.zip | |
openorienteering-mapper: 0.9.3 -> 0.9.4
| -rw-r--r-- | pkgs/applications/gis/openorienteering-mapper/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 8 insertions, 11 deletions
diff --git a/pkgs/applications/gis/openorienteering-mapper/default.nix b/pkgs/applications/gis/openorienteering-mapper/default.nix index 540fa271897..45c38b3e573 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f25888c3a60..d273cd66ad5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22595,7 +22595,7 @@ in 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 {}; |