2 files changed, 45 insertions, 14 deletions
diff --git a/packages/komodo/komodo.scm b/packages/komodo/komodo.scm
index df9731d..5f6570c 100644
--- a/packages/komodo/komodo.scm
+++ b/packages/komodo/komodo.scm
@@ -30,6 +30,7 @@
   #:use-module (guix packages)
   #:use-module (refl-cpp)
   #:use-module (sortfilterproxymodel)
+  #:use-module (spdlog)
   #:use-module (strong-type)
   #:use-module (taskflow-2)
   #:use-module (wally))
@@ -374,20 +375,6 @@
 	   (arguments libsodium-komodo-arguments)
 	   (inputs libsodium-komodo-inputs)))
 
-(define spdlog-1.8
-  (package (inherit spdlog)
-	   (version "1.8.5")
-	   (source (origin (uri (git-reference (url "https://github.com/gabime/spdlog")
-					       (commit (string-append "v"
-								      version))))
-			   (method git-fetch)
-			   (file-name (git-file-name "spdlog" version))
-			   (sha256 (base32
-				    "179krvg5sad6dviqpcjwg6czzknnilqszrg1d0fgp12h6sy66vqg"))))
-	   (arguments (list #:configure-flags '(list "-DSPDLOG_BUILD_BENCH=OFF"
-						     "-DSPDLOG_BUILD_SHARED=OFF")
-			    #:tests? #f))))
-
 ;;; ABSTRACTION LAYER 0
 
 (define komodo-wallet-arguments
diff --git a/packages/komodo/spdlog.scm b/packages/komodo/spdlog.scm
new file mode 100644
index 0000000..1b1c170
--- /dev/null
+++ b/packages/komodo/spdlog.scm
@@ -0,0 +1,44 @@
+(define-module (spdlog)
+  #:use-module (gnu packages logging)
+  #:use-module (guix git-download)
+  #:use-module (guix packages))
+
+;; DATA LAYER
+
+(define configure-flags-inherited
+  (list "-DSPDLOG_BUILD_BENCH=OFF"
+	"-DSPDLOG_BUILD_SHARED=ON"))
+
+(define tests?
+  #f)
+
+(define version
+  "1.8.5")
+
+;; ABSTRACTION LAYER -1
+
+(define configure-flags
+  `',configure-flags-inherited)
+
+;; ABSTRACTION LAYER -0
+
+(define arguments
+  (list #:configure-flags configure-flags
+	#:tests? tests?))
+
+(define source
+  (origin (uri (git-reference (url "https://github.com/gabime/spdlog")
+			      (commit (string-append "v"
+						     version))))
+	  (method git-fetch)
+	  (file-name (git-file-name "spdlog" version))
+	  (sha256 (base32
+		   "179krvg5sad6dviqpcjwg6czzknnilqszrg1d0fgp12h6sy66vqg"))))
+
+;; SURFACE LAYER
+
+(define-public spdlog-1.8
+  (package (inherit spdlog)
+	   (version version)
+	   (source source)
+	   (arguments arguments)))