Fix incorrectly named library targets in komodo-wallet cmake files

2 files changed, 59 insertions, 3 deletions

diff --git a/packages/komodo/doom-meta.scm b/packages/komodo/doom-meta.scm
new file mode 100644
index 0000000..0afeb21
--- /dev/null
+++ b/packages/komodo/doom-meta.scm
@@ -0,0 +1,41 @@
+(define-module (doom-meta)
+  #:use-module (gnu packages compression)
+  #:use-module (guix build utils)
+  #:use-module (guix build-system cmake)
+  #:use-module (guix download)
+  #:use-module ((guix licenses)
+		#:prefix license:)
+  #:use-module (guix packages))
+
+(define doom-meta-version "1.0.1")
+
+(define doom-meta-delete-null-targets
+  '(modify-phases %standard-phases
+		  (delete 'check)
+		  (delete 'install)))
+
+(define doom-meta-hash
+  (content-hash "08zmdgqkf0gp2vc73fzf35far5v67l4mhlr577fv6hv22v0kgjjj"))
+
+(define doom-meta-arguments
+  (list #:phases doom-meta-delete-null-targets))
+
+(define doom-meta-native-inputs
+  (list unzip))
+
+(define doom-meta-origin
+  (origin (uri "https://github.com/KomodoPlatform/meta/archive/master.zip")
+	  (method url-fetch)
+	  (hash doom-meta-hash)))
+
+(define-public doom-meta
+  (package (name "doom-meta")
+	   (version doom-meta-version)
+	   (source doom-meta-origin)
+	   (build-system cmake-build-system)
+	   (arguments doom-meta-arguments)
+	   (native-inputs doom-meta-native-inputs)
+	   (synopsis "Just a few metaprogramming utilities in C++")
+	   (description "Just a few metaprogramming utilities in C++")
+	   (license license:expat)
+	   (home-page "https://github.com/doom/meta")))
diff --git a/packages/komodo/komodo.scm b/packages/komodo/komodo.scm
index 7ee7eae..5538cd3 100644
--- a/packages/komodo/komodo.scm
+++ b/packages/komodo/komodo.scm
@@ -1,5 +1,6 @@
 (define-module (komodo)
   #:use-module (cpprestsdk)
+  #:use-module (doom-meta)
   #:use-module (gnu packages)
   #:use-module (gnu packages boost)
   #:use-module (gnu packages calendar)
@@ -131,6 +132,17 @@
 		  ,prepare-mm2-src
 		  "\n"))
 
+(define fix-date
+  `(substitute* "cmake/dependencies.cmake"
+		(("date-tz")
+		 "date")))
+
+(define fix-doom-meta
+  `(substitute* (list "vendor/antara-gaming_sdk/modules/event/CMakeLists.txt"
+		      "vendor/antara-gaming_sdk/modules/ecs/CMakeLists.txt")
+		(("doom::meta")
+		 "doom")))
+
 (define replace-vcpkg
   `(substitute* "CMakeLists.txt"
 		(("include\\(vcpkg_prerequisites\\)")
@@ -146,9 +158,12 @@
   #~ (modify-phases %standard-phases
 		    (add-after 'unpack
 			       'delete-vcpkg
-			       (lambda _ #+ replace-vcpkg))))
+			       (lambda _
+				 #+ replace-vcpkg
+				 #+ fix-date
+				 #+ fix-doom-meta))))
 
-;;; Package Definitions
+;;; Komodo-wallet Package Definitions
 
 (define komodo-wallet-arguments
   (list #:phases komodo-wallet-phases
@@ -161,7 +176,7 @@
 		 "give up control over your digital assets."))
 
 (define komodo-wallet-native-inputs
-  (list boost cpprestsdk date doctest entt fmt git libsodium-komodo
+  (list boost cpprestsdk date doctest doom-meta entt fmt git libsodium-komodo
 	nlohmann-json openssl qtcharts qtdeclarative-5 qttools-5 qtsvg-5
 	qtwebengine-5 range-v3 spdlog zlib))