pyrox.dev
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
pkgs/applications/misc/organicmaps/default.nix
+2
-14
pkgs/applications/misc/organicmaps/default.nix
···
8
8
, which
9
9
, python3
10
10
, rsync
11
-
, makeWrapper
12
11
, qtbase
13
12
, qtsvg
14
13
, libGLU
···
20
19
21
20
mkDerivation rec {
22
21
pname = "organicmaps";
23
-
version = "2022.05.31-10";
22
+
version = "2022.06.18-2";
24
23
25
24
src = fetchFromGitHub {
26
25
owner = "organicmaps";
27
26
repo = "organicmaps";
28
27
rev = "${version}-android";
29
-
sha256 = "sha256-2GeWa4CQoY7hi24q0/cZBbq1Ofl2Jane9BiZ0N+IsSc=";
28
+
sha256 = "sha256-FlytRGiqGr9L5ZwL1slbPjagJKsleOXM8+loPmtfccI=";
30
29
fetchSubmodules = true;
31
30
};
32
31
···
45
44
which
46
45
python3
47
46
rsync
48
-
makeWrapper
49
47
];
50
48
51
49
# Most dependencies are vendored
···
62
60
# Yes, this is PRE configure. The configure phase uses cmake
63
61
preConfigure = ''
64
62
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
63
'';
76
64
77
65
meta = with lib; {