diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2022-04-27 16:41:30 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-27 16:41:30 +0200 |
commit | 9fe3f8ab9b10151cb7bcea83babd97a5929162f6 (patch) | |
tree | 4a15ae5f875bb6ab895d23f07ed53212557a6457 /pkgs/applications/misc | |
parent | b505462dca1c6d5dcedc3c7be67993ffa5367aac (diff) | |
parent | 36f4c18c2b08c5f2e950afb023eaef58b368ce6d (diff) |
Merge pull request #170625 from fgaz/organicmaps/2022.04.27-2
organicmaps: 2022.03.23-4-android -> 2022.04.27-2
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/organicmaps/default.nix | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/pkgs/applications/misc/organicmaps/default.nix b/pkgs/applications/misc/organicmaps/default.nix index 7e320e5f367aa..fa4b5457e4f75 100644 --- a/pkgs/applications/misc/organicmaps/default.nix +++ b/pkgs/applications/misc/organicmaps/default.nix @@ -20,13 +20,13 @@ mkDerivation rec { pname = "organicmaps"; - version = "2022.03.23-4-android"; + version = "2022.04.27-2"; src = fetchFromGitHub { owner = "organicmaps"; repo = "organicmaps"; - rev = version; - sha256 = "sha256-4VBsHq8z/odD7Nrk9e0sYMEBBLeTAHsWsdgPIN1KVZo="; + rev = "${version}-android"; + sha256 = "sha256-HsskddXne5xClBZoT3aXP+51VRQQJhlUPda/M20SrH0="; fetchSubmodules = true; }; @@ -35,7 +35,7 @@ mkDerivation rec { echo "exit 0" > tools/unix/check_cert.sh # crude fix for https://github.com/organicmaps/organicmaps/issues/1862 - echo "echo ${lib.replaceStrings ["." "-" "android"] ["" "" ""] version}" > tools/unix/version.sh + echo "echo ${lib.replaceStrings ["." "-"] ["" ""] version}" > tools/unix/version.sh ''; nativeBuildInputs = [ @@ -64,19 +64,14 @@ mkDerivation rec { bash ./configure.sh ''; + # Tell the program that the read-only and the read-write data locations + # are different, and create the read-write one. + # https://github.com/organicmaps/organicmaps/issues/2387 postInstall = '' - install -Dm755 OMaps $out/bin/OMaps - # Tell the program that the read-only and the read-write data locations - # are different, and create the read-write one. wrapProgram $out/bin/OMaps \ --add-flags "-resources_path $out/share/organicmaps/data" \ --add-flags '-data_path "''${XDG_DATA_HOME:-''${HOME}/.local/share}/OMaps"' \ --run 'mkdir -p "''${XDG_DATA_HOME:-''${HOME}/.local/share}/OMaps"' - - mkdir -p $out/share/organicmaps - cp -r ../data $out/share/organicmaps/data - install -Dm644 ../qt/res/logo.png $out/share/icons/hicolor/96x96/apps/organicmaps.png - install -Dm644 ../qt/res/OrganicMaps.desktop $out/share/applications/OrganicMaps.desktop ''; meta = with lib; { |