diff options
author | Guillaume Girol <symphorien@users.noreply.github.com> | 2022-06-25 11:28:59 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-25 11:28:59 +0000 |
commit | fd12bdb8d8daf4e7088081294ee1a3e4361f3b18 (patch) | |
tree | 5a49ffae0b428f1379d62f8139b96a1701b10947 /pkgs | |
parent | 2417363ae2de5169338f3ec502d50ea9aaaa4b2e (diff) | |
parent | 7da3e7fa2eb65bfb117c136de8f14ad76002e9b5 (diff) |
Merge pull request #178238 from fgaz/organicmaps/2022.06.18-2
organicmaps: 2022.05.31-10 -> 2022.06.18-2
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/misc/organicmaps/default.nix | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/pkgs/applications/misc/organicmaps/default.nix b/pkgs/applications/misc/organicmaps/default.nix index 0930edbd4158b..c44fc41a5c650 100644 --- a/pkgs/applications/misc/organicmaps/default.nix +++ b/pkgs/applications/misc/organicmaps/default.nix @@ -8,7 +8,6 @@ , which , python3 , rsync -, makeWrapper , qtbase , qtsvg , libGLU @@ -20,13 +19,13 @@ mkDerivation rec { pname = "organicmaps"; - version = "2022.05.31-10"; + version = "2022.06.18-2"; src = fetchFromGitHub { owner = "organicmaps"; repo = "organicmaps"; rev = "${version}-android"; - sha256 = "sha256-2GeWa4CQoY7hi24q0/cZBbq1Ofl2Jane9BiZ0N+IsSc="; + sha256 = "sha256-FlytRGiqGr9L5ZwL1slbPjagJKsleOXM8+loPmtfccI="; fetchSubmodules = true; }; @@ -45,7 +44,6 @@ mkDerivation rec { which python3 rsync - makeWrapper ]; # Most dependencies are vendored @@ -64,16 +62,6 @@ 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 = '' - 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"' - ''; - meta = with lib; { # darwin: "invalid application of 'sizeof' to a function type" broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; |