komodo: change libsodium-komodo package: easier to understand

1 files changed, 53 insertions, 54 deletions

diff --git a/packages/komodo/komodo.scm b/packages/komodo/komodo.scm
index 5910cb7..677bf34 100644
--- a/packages/komodo/komodo.scm
+++ b/packages/komodo/komodo.scm
@@ -79,7 +79,7 @@
   ".")
 
 (define libsodium-komodo-hash
-  "135z5xx0cksqhka3dk9nz5zhiqvp1bdsmar7l2ajy0528w86gssc")
+  "0yk9pyj7bl421hb20lg9yaysqvcgrk7860613674la0gk5glq34d")
 
 (define libsodium-komodo-files-commit
   "main")
@@ -172,6 +172,21 @@
 	  (method url-fetch)
 	  (hash jl777-coins-content-hash)))
 
+(define komodo-vcpkg-ports
+  (package (name "komodo-vcpkg-ports")
+	   (version "main")
+	   (source (origin (uri (git-reference (url
+						"https://github.com/KomodoPlatform/vcpkg-custom-ports.git")
+					       (commit "main")))
+			   (method git-fetch)
+			   (sha256 (base32 "0nw78mmncjbgl7cjpbcy9wkch7hlqaavr03n9ls6nkjacx3klyy6"))))
+	   (build-system copy-build-system)
+	   (arguments (list #:install-plan '(list (list "ports/libsodium/" "."))))
+	   (synopsis "Komodo VCPKG port files")
+	   (description "Komodo VCPKG port files")
+	   (license license:expat)
+	   (home-page "https://github.com/KomodoPlatform/vcpkg-custom-ports/tree/main")))
+
 (define komodo-wallet-origin
   (origin (uri komodo-wallet-git-reference)
 	  (method git-fetch)
@@ -187,6 +202,9 @@
 (define libsodium-files
   `(list ,libsodium-files-source ,libsodium-files-target))
 
+(define libsodium-komodo-inputs
+  (list komodo-vcpkg-ports))
+
 (define prepare-build-paths
   `(string-append "file(MAKE_DIRECTORY \"" ,build-path-expected "\")\n"
 		  "file(MAKE_DIRECTORY \"" ,build-path-jl777-coins "\")\n"
@@ -209,6 +227,13 @@
 
 ;;; ABSTRACTION LAYER -5
 
+(define libsodium-komodo-clause-create-cmakelists
+  '(lambda _
+     (let ((source-directory ".")
+	   (vcpkg-port-libsodium-directory "/gnu/store/dh1dnil0kixzwg87gwbalhay8zmp924y-komodo-vcpkg-ports-main"))
+       (copy-recursively vcpkg-port-libsodium-directory
+			 source-directory))))
+
 (define vcpkg-replacement
   `(string-append "\n"
 		  ,prepare-build-paths
@@ -217,40 +242,8 @@
 		  ,prepare-mm2-src
 		  "\n"))
 
-(define libsodium-komodo-file-transfer
-  `(copy-recursively (assoc-ref inputs
-				"libsodium-komodo-files")
-		     "."))
-
-(define libsodium-komodo-files-content-hash
-  (content-hash (base32 libsodium-komodo-files-hash)))
-
-(define libsodium-komodo-files-git-reference
-  (git-reference (url libsodium-komodo-files-url)
-		 (commit libsodium-komodo-files-commit)))
-
-(define libsodium-komodo-files-install-plan
-  `(list ,libsodium-files))
-
 ;;; ABSTRACTION LAYER -4
 
-(define libsodium-komodo-content-hash
-  (content-hash (base32 libsodium-komodo-hash)))
-
-(define libsodium-komodo-files-arguments
-  (list #:install-plan libsodium-komodo-files-install-plan))
-
-(define libsodium-komodo-files-origin
-  (origin (uri libsodium-komodo-files-git-reference)
-	  (method git-fetch)
-	  (hash libsodium-komodo-files-content-hash)))
-
-(define libsodium-komodo-transfer-files
-  `(add-after 'unpack
-	      'transfer-files
-	      (lambda* (#:key inputs #:allow-other-keys)
-		,libsodium-komodo-file-transfer)))
-
 (define fix-date
   `(substitute* "cmake/dependencies.cmake"
 		(("date::date-tz")
@@ -267,6 +260,17 @@
 		(("STD")
 		 "STD\n#include <nlohmann/json.hpp>")))
 
+(define libsodium-komodo-phases-create-cmakelists
+  `(add-after 'unpack
+	      'create-cmakelists
+	      ,libsodium-komodo-clause-create-cmakelists))
+
+(define libsodium-komodo-probe
+  `(add-before 'configure
+	       'probe
+	       (lambda _
+		 (invoke "ls" "-al" "."))))
+
 (define link-libraries
   `(substitute* "cmake/dependencies.cmake"
 		(("ALIAS refl-cpp\\)")
@@ -307,25 +311,22 @@
 (define entt-komodo-content-hash-get
   (content-hash (base32 entt-komodo-hash)))
 
-(define libsodium-komodo-files
-  (package (inherit libsodium)
-	   (name "libsodium-komodo-files")
-	   (source libsodium-komodo-files-origin)
-	   (build-system copy-build-system)
-	   (arguments libsodium-komodo-files-arguments)))
-
 (define libsodium-komodo-phases
   `(modify-phases %standard-phases
-		  ,libsodium-komodo-transfer-files))
+		  ,libsodium-komodo-phases-create-cmakelists
+		  ,libsodium-komodo-probe))
+
+(define libsodium-komodo-sha256
+  (base32 libsodium-komodo-hash))
+
+(define libsodium-komodo-uri
+  (git-reference (url "https://github.com/jedisct1/libsodium")
+		 (commit "1.0.19")))
 
 (define entt-komodo-git-reference-get
   (git-reference (url entt-komodo-git-reference-url)
 		 (commit entt-komodo-version)))
 
-(define libsodium-komodo-git-reference
-  (git-reference (url libsodium-komodo-git-reference-url)
-		 (commit libsodium-komodo-git-reference-commit)))
-
 (define wally-git-reference-get
   (git-reference (url wally-git-url)
 		 (commit wally-git-commit)))
@@ -347,15 +348,13 @@
 (define get-wally-version wally-version)
 
 (define libsodium-komodo-arguments
-  (list #:phases libsodium-komodo-phases))
-
-(define libsodium-komodo-inputs-get
-  (list autoconf automake libsodium-komodo-files libtool python))
+  (list #:phases libsodium-komodo-phases
+	#:tests? #f))
 
-(define libsodium-komodo-origin-get
-  (origin (uri libsodium-komodo-git-reference)
+(define libsodium-komodo-origin
+  (origin (uri libsodium-komodo-uri)
 	  (method git-fetch)
-	  (hash libsodium-komodo-content-hash)))
+	  (sha256 libsodium-komodo-sha256)))
 
 (define modify-cmake-configuration
   `(add-after 'unpack
@@ -415,10 +414,10 @@
 (define libsodium-komodo
   (package (inherit libsodium)
 	   (name "libsodium-komodo")
-	   (source libsodium-komodo-origin-get)
+	   (source libsodium-komodo-origin)
 	   (build-system cmake-build-system)
 	   (arguments libsodium-komodo-arguments)
-	   (inputs libsodium-komodo-inputs-get)))
+	   (inputs libsodium-komodo-inputs)))
 
 (define spdlog-1.8
   (package (inherit spdlog)