From 4205302940e1af8d796bc69978f8cf58a1f6c151 Mon Sep 17 00:00:00 2001 From: Marek Paśnikowski Date: Mon, 25 Mar 2024 23:38:59 +0100 Subject: komodo: switch to ninja build system and enable submodules: better debug --- packages/komodo/komodo.scm | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'packages/komodo') diff --git a/packages/komodo/komodo.scm b/packages/komodo/komodo.scm index 5f6570c..26f0ffe 100644 --- a/packages/komodo/komodo.scm +++ b/packages/komodo/komodo.scm @@ -11,6 +11,7 @@ #:use-module (gnu packages crypto) #:use-module (gnu packages game-development) #:use-module (gnu packages logging) + #:use-module (gnu packages ninja) #:use-module (gnu packages perl) #:use-module (gnu packages pretty-print) #:use-module (gnu packages python) @@ -57,7 +58,7 @@ (define jl777-coins-src "jl777-coins-src/") (define komodo-wallet-hash - "0rc33ivcmgqnlzvx5z589wlcdr2ivj645mrzvcvlan33lqf04441") + "1gsw8kiz7r68yhzhvmcgrzaly8981nw9p7n8vmqmhdxl4av41sqd") (define komodo-wallet-home-page "https://atomicdex.io/") @@ -117,7 +118,8 @@ (define komodo-wallet-git-reference (git-reference (url "https://github.com/KomodoPlatform/komodo-wallet-desktop") - (commit komodo-wallet-version))) + (commit komodo-wallet-version) + (recursive? #t))) (define expected-content-hash (content-hash (base32 expected-hash))) @@ -270,7 +272,7 @@ (define remove-unity `(substitute* "src/CMakeLists.txt" (("UNITY_BUILD ON") - "UNITY_BUILD OFF"))) + "UNITY_BUILD ON"))) (define replace-vcpkg `(substitute* "CMakeLists.txt" @@ -361,11 +363,14 @@ (define komodo-wallet-configure-flags `(list "-DFETCHCONTENT_FULLY_DISCONNECTED=ON" "-Wno-dev" - "-DCMAKE_BUILD_TYPE=MinSizeRel")) + "-DCMAKE_BUILD_TYPE=MinSizeRel" + "-GNinja")) (define komodo-wallet-phases #~(modify-phases %standard-phases - #+modify-cmake-configuration)) + #+modify-cmake-configuration + (replace 'build + (lambda _ (invoke "ninja" "install"))))) (define libsodium-komodo (package (inherit libsodium) @@ -386,7 +391,7 @@ (define komodo-wallet-inputs (list boost cpprestsdk date-komodo doctest doom-meta entt-komodo fmt git - libsodium-komodo nlohmann-json openssl perl python qtcharts + libsodium-komodo ninja nlohmann-json openssl perl python qtcharts qtdeclarative-5 qttools-5 qtsvg-5 qtwebengine-5 range-v3 refl-cpp sortfilterproxymodel spdlog-1.8 strong-type taskflow-2 wally zlib)) -- cgit v1.2.3