Merge pull request #178238 from fgaz/organicmaps/2022.06.18-2

organicmaps: 2022.05.31-10 -> 2022.06.18-2

authored by Guillaume Girol and committed by GitHub fd12bdb8 2417363a

+2 -14
+2 -14
pkgs/applications/misc/organicmaps/default.nix
··· 8 , which 9 , python3 10 , rsync 11 - , makeWrapper 12 , qtbase 13 , qtsvg 14 , libGLU ··· 20 21 mkDerivation rec { 22 pname = "organicmaps"; 23 - version = "2022.05.31-10"; 24 25 src = fetchFromGitHub { 26 owner = "organicmaps"; 27 repo = "organicmaps"; 28 rev = "${version}-android"; 29 - sha256 = "sha256-2GeWa4CQoY7hi24q0/cZBbq1Ofl2Jane9BiZ0N+IsSc="; 30 fetchSubmodules = true; 31 }; 32 ··· 45 which 46 python3 47 rsync 48 - makeWrapper 49 ]; 50 51 # Most dependencies are vendored ··· 62 # Yes, this is PRE configure. The configure phase uses cmake 63 preConfigure = '' 64 bash ./configure.sh 65 - ''; 66 - 67 - # Tell the program that the read-only and the read-write data locations 68 - # are different, and create the read-write one. 69 - # https://github.com/organicmaps/organicmaps/issues/2387 70 - postInstall = '' 71 - wrapProgram $out/bin/OMaps \ 72 - --add-flags "-resources_path $out/share/organicmaps/data" \ 73 - --add-flags '-data_path "''${XDG_DATA_HOME:-''${HOME}/.local/share}/OMaps"' \ 74 - --run 'mkdir -p "''${XDG_DATA_HOME:-''${HOME}/.local/share}/OMaps"' 75 ''; 76 77 meta = with lib; {
··· 8 , which 9 , python3 10 , rsync 11 , qtbase 12 , qtsvg 13 , libGLU ··· 19 20 mkDerivation rec { 21 pname = "organicmaps"; 22 + version = "2022.06.18-2"; 23 24 src = fetchFromGitHub { 25 owner = "organicmaps"; 26 repo = "organicmaps"; 27 rev = "${version}-android"; 28 + sha256 = "sha256-FlytRGiqGr9L5ZwL1slbPjagJKsleOXM8+loPmtfccI="; 29 fetchSubmodules = true; 30 }; 31 ··· 44 which 45 python3 46 rsync 47 ]; 48 49 # Most dependencies are vendored ··· 60 # Yes, this is PRE configure. The configure phase uses cmake 61 preConfigure = '' 62 bash ./configure.sh 63 ''; 64 65 meta = with lib; {