From 546adc67e70ce0b1aa6a34ad2ccc0238548320ed Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Tue, 7 Mar 2023 10:05:36 +0100 Subject: [PATCH 1/2] organicmaps: 2023.01.25-3 -> 2023.03.05-5 --- pkgs/applications/misc/organicmaps/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/organicmaps/default.nix b/pkgs/applications/misc/organicmaps/default.nix index bbd8aaaa848b..a1b4f28997c3 100644 --- a/pkgs/applications/misc/organicmaps/default.nix +++ b/pkgs/applications/misc/organicmaps/default.nix @@ -15,17 +15,18 @@ , zlib , icu , freetype +, pugixml }: mkDerivation rec { pname = "organicmaps"; - version = "2023.01.25-3"; + version = "2023.03.05-5"; src = fetchFromGitHub { owner = "organicmaps"; repo = "organicmaps"; rev = "${version}-android"; - sha256 = "sha256-4nlD/GFOoBOCXVWtC7i6SUquEbob5++GyagZOTznygU="; + sha256 = "sha256-PfudozmrL8jNS/99nxSn0B3E53W34m4/ZN0y2ucB2WI="; fetchSubmodules = true; }; @@ -55,6 +56,7 @@ mkDerivation rec { zlib icu freetype + pugixml ]; # Yes, this is PRE configure. The configure phase uses cmake From f59d3afcd5e0d0e7e763155254b89ef115ecb654 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Tue, 7 Mar 2023 10:08:18 +0100 Subject: [PATCH 2/2] organicmaps: add updateScript --- pkgs/applications/misc/organicmaps/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/misc/organicmaps/default.nix b/pkgs/applications/misc/organicmaps/default.nix index a1b4f28997c3..8fa0a8e7576f 100644 --- a/pkgs/applications/misc/organicmaps/default.nix +++ b/pkgs/applications/misc/organicmaps/default.nix @@ -16,6 +16,7 @@ , icu , freetype , pugixml +, nix-update-script }: mkDerivation rec { @@ -64,6 +65,13 @@ mkDerivation rec { bash ./configure.sh ''; + passthru = { + updateScript = nix-update-script { + attrPath = pname; + extraArgs = [ "-vr" "(.*)-android" ]; + }; + }; + meta = with lib; { # darwin: "invalid application of 'sizeof' to a function type" broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;