From 17baa1d05b3db978b144c1b1cc3def58bfc89fe4 Mon Sep 17 00:00:00 2001
From: Marek Paśnikowski <marek@marekpasnikowski.pl>
Date: Sat, 23 Mar 2024 19:04:00 +0100
Subject: komodo: use Komodo's entt: dependency alignment

---
 packages/komodo/komodo.scm | 34 ++++++++++++++++++++++++++++++----
 1 file changed, 30 insertions(+), 4 deletions(-)

(limited to 'packages/komodo')

diff --git a/packages/komodo/komodo.scm b/packages/komodo/komodo.scm
index e80aef3..9ffb008 100644
--- a/packages/komodo/komodo.scm
+++ b/packages/komodo/komodo.scm
@@ -34,6 +34,15 @@
 
 (define build-deps-prefix "../build/_deps/")
 
+(define entt-komodo-version
+  "v3.6.0")
+
+(define entt-komodo-git-reference-url
+  "https://github.com/KomodoPlatform/entt")
+
+(define entt-komodo-hash
+  "17w0gx6xah8j2d1kc6ly7a8jvkp4jspmn505w724hynlvlx1192x")
+
 (define expected-hash "17akrv80h0n4cfmxwvlvbb8ycqza7y3qqygjyphv95rrabqm9r02")
 
 (define expected-src "expected-src/")
@@ -209,12 +218,24 @@
      ,fix-date
      ,fix-doom-meta))
 
+(define entt-komodo-content-hash-get
+  (content-hash (base32 entt-komodo-hash)))
+
+(define entt-komodo-git-reference-get
+  (git-reference (url entt-komodo-git-reference-url)
+		 (commit entt-komodo-version)))
+
 (define wally-git-reference-get
   (git-reference (url wally-git-url)
 		 (commit wally-git-commit)))
 
 ;;; ABSTRACTION LAYER -2
 
+(define entt-komodo-origin-get
+  (origin (uri entt-komodo-git-reference-get)
+	  (method git-fetch)
+	  (hash entt-komodo-content-hash-get)))
+
 (define get-wally-name wally-name)
 
 (define get-wally-origin
@@ -242,6 +263,11 @@
 
 ;;; ABSTRACTION LAYER -1
 
+(define entt-komodo
+  (package (inherit entt)
+	   (version entt-komodo-version)
+	   (source entt-komodo-origin-get)))
+
 (define komodo-wallet-configure-flags
   '(list "-DFETCHCONTENT_FULLY_DISCONNECTED=ON"
 	 "-Wno-dev"))
@@ -271,10 +297,10 @@
   (string-concatenate komodo-wallet-description-lines))
 
 (define komodo-wallet-native-inputs
-  (list boost cpprestsdk date doctest doom-meta entt fmt git libsodium-komodo
-	nlohmann-json openssl perl python qtcharts qtdeclarative-5 qttools-5
-	qtsvg-5	qtwebengine-5 range-v3 refl-cpp spdlog strong-type taskflow-2
-	wally zlib))
+  (list boost cpprestsdk date doctest doom-meta entt-komodo fmt git
+	libsodium-komodo nlohmann-json openssl perl python qtcharts
+	qtdeclarative-5 qttools-5 qtsvg-5 qtwebengine-5 range-v3 refl-cpp
+	spdlog strong-type taskflow-2 wally zlib))
 
 (define komodo-wallet-synopsis
   (string-concatenate komodo-wallet-synopsis-lines))
-- 
cgit v1.2.3