diff options
| author | Francesco Gazzetta <fgaz@fgaz.me> | 2023-08-22 22:04:58 +0200 |
|---|---|---|
| committer | Francesco Gazzetta <fgaz@fgaz.me> | 2023-08-29 09:23:25 +0200 |
| commit | 854e4a2e5329f24fd991b0a62202bd0d7fe0808f (patch) | |
| tree | 712b12d9e399a5c02889a71fa69dd535e6cca659 | |
| parent | 17544589b02100b9fa5c49fca82dfe489a060053 (diff) | |
| download | nixpkgs-854e4a2e5329f24fd991b0a62202bd0d7fe0808f.tar nixpkgs-854e4a2e5329f24fd991b0a62202bd0d7fe0808f.tar.gz nixpkgs-854e4a2e5329f24fd991b0a62202bd0d7fe0808f.tar.bz2 nixpkgs-854e4a2e5329f24fd991b0a62202bd0d7fe0808f.tar.lz nixpkgs-854e4a2e5329f24fd991b0a62202bd0d7fe0808f.tar.xz nixpkgs-854e4a2e5329f24fd991b0a62202bd0d7fe0808f.tar.zst nixpkgs-854e4a2e5329f24fd991b0a62202bd0d7fe0808f.zip | |
organicmaps: 2023.06.04-13 -> 2023.08.18-8
| -rw-r--r-- | pkgs/applications/misc/organicmaps/default.nix | 19 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 16 insertions, 5 deletions
diff --git a/pkgs/applications/misc/organicmaps/default.nix b/pkgs/applications/misc/organicmaps/default.nix index 236a3190c80..f0d4a10dd6d 100644 --- a/pkgs/applications/misc/organicmaps/default.nix +++ b/pkgs/applications/misc/organicmaps/default.nix @@ -1,5 +1,4 @@ { lib -, mkDerivation , stdenv , fetchFromGitHub , cmake @@ -8,6 +7,7 @@ , which , python3 , rsync +, wrapQtAppsHook , qtbase , qtsvg , libGLU @@ -19,15 +19,22 @@ , nix-update-script }: -mkDerivation rec { +let + world_feed_integration_tests_data = fetchFromGitHub { + owner = "organicmaps"; + repo = "world_feed_integration_tests_data"; + rev = "3b66e59eaae85ebc583ce20baa3bdf27811349c4"; + hash = "sha256-wOZKqwYxJLllyxCr44rAcropKhohLUIVCtsR5tz9TRw="; + }; +in stdenv.mkDerivation rec { pname = "organicmaps"; - version = "2023.06.04-13"; + version = "2023.08.18-8"; src = fetchFromGitHub { owner = "organicmaps"; repo = "organicmaps"; rev = "${version}-android"; - hash = "sha256-HoEOKN99ClR1sa8YFZcS9XomtXnTRdAXS0iQEdDrhvc="; + hash = "sha256-vdleO4jNKibyDlqrfZsOCScpQ9zreuYSw2BSoNpmeLY="; fetchSubmodules = true; }; @@ -40,6 +47,9 @@ mkDerivation rec { # TODO use system boost instead, see https://github.com/organicmaps/organicmaps/issues/5345 patchShebangs 3party/boost/tools/build/src/engine/build.sh + + # Prefetch test data, or the build system will try to fetch it with git. + ln -s ${world_feed_integration_tests_data} data/world_feed_integration_tests_data ''; nativeBuildInputs = [ @@ -49,6 +59,7 @@ mkDerivation rec { which python3 rsync + wrapQtAppsHook ]; # Most dependencies are vendored diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb4dc6500bb..32564ee9a61 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34165,7 +34165,7 @@ with pkgs; orca-c = callPackage ../applications/audio/orca-c { }; - organicmaps = libsForQt5.callPackage ../applications/misc/organicmaps { }; + organicmaps = qt6Packages.callPackage ../applications/misc/organicmaps { }; osm2xmap = callPackage ../applications/misc/osm2xmap { }; |