komodo: implement purer libsodium-komodo package: remove dependency on local files

1 files changed, 97 insertions, 2 deletions

diff --git a/packages/komodo/komodo.scm b/packages/komodo/komodo.scm
index 9ffb008..d497b63 100644
--- a/packages/komodo/komodo.scm
+++ b/packages/komodo/komodo.scm
@@ -8,6 +8,7 @@
   #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages cpp)
+  #:use-module (gnu packages crypto)
   #:use-module (gnu packages game-development)
   #:use-module (gnu packages logging)
   #:use-module (gnu packages perl)
@@ -17,6 +18,8 @@
   #:use-module (gnu packages tls)
   #:use-module (gnu packages version-control)
   #:use-module (guix build utils)
+  #:use-module (guix build-system cmake)
+  #:use-module (guix build-system copy)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system qt)
   #:use-module (guix download)
@@ -25,7 +28,6 @@
   #:use-module ((guix licenses)
 		#:prefix license:)
   #:use-module (guix packages)
-  #:use-module (libsodium-komodo)
   #:use-module (refl-cpp)
   #:use-module (strong-type)
   #:use-module (taskflow-2))
@@ -52,7 +54,7 @@
 (define jl777-coins-src "jl777-coins-src/")
 
 (define komodo-wallet-hash
-  "0pfkgas0xkixf99zqzyri80ksp89b7dw7hbcgpp60ni2cnchxk2n")
+  "0rc33ivcmgqnlzvx5z589wlcdr2ivj645mrzvcvlan33lqf04441")
 
 (define komodo-wallet-home-page "https://atomicdex.io/")
 
@@ -69,6 +71,30 @@
 
 (define komodo-wallet-version "0.7.1-beta")
 
+(define libsodium-files-source
+  "ports/libsodium/")
+
+(define libsodium-files-target
+  ".")
+
+(define libsodium-komodo-hash
+  "135z5xx0cksqhka3dk9nz5zhiqvp1bdsmar7l2ajy0528w86gssc")
+
+(define libsodium-komodo-files-commit
+  "main")
+
+(define libsodium-komodo-files-url
+  "https://github.com/KomodoPlatform/vcpkg-custom-ports.git")
+
+(define libsodium-komodo-files-hash
+  "0nw78mmncjbgl7cjpbcy9wkch7hlqaavr03n9ls6nkjacx3klyy6")
+
+(define libsodium-komodo-git-reference-commit
+  "1.0.18")
+
+(define libsodium-komodo-git-reference-url
+  "https://github.com/jedisct1/libsodium")
+
 (define mm2-hash "1bn2sjcrp9ih44h3p96prnwg74aids7fgzcnlv3c68nan6y2lysi")
 
 (define mm2-src "mm2-src/")
@@ -157,6 +183,9 @@
 
 ;;; ABSTRACTION LAYER -6
 
+(define libsodium-files
+  `(list ,libsodium-files-source ,libsodium-files-target))
+
 (define prepare-build-paths
   `(string-append "file(MAKE_DIRECTORY \"" ,build-path-expected "\")\n"
 		  "file(MAKE_DIRECTORY \"" ,build-path-jl777-coins "\")\n"
@@ -187,8 +216,40 @@
 		  ,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-tz")
@@ -221,10 +282,25 @@
 (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))
+
 (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)))
@@ -245,6 +321,17 @@
 
 (define get-wally-version wally-version)
 
+(define libsodium-komodo-arguments
+  (list #:phases libsodium-komodo-phases))
+
+(define libsodium-komodo-native-inputs-get
+  (list autoconf automake libsodium-komodo-files libtool python))
+
+(define libsodium-komodo-origin-get
+  (origin (uri libsodium-komodo-git-reference)
+	  (method git-fetch)
+	  (hash libsodium-komodo-content-hash)))
+
 (define modify-cmake-configuration
   `(add-after 'unpack
 	      'delete-vcpkg
@@ -276,6 +363,14 @@
   #~(modify-phases %standard-phases
 		   #+modify-cmake-configuration))
 
+(define libsodium-komodo
+  (package (inherit libsodium)
+	   (name "libsodium-komodo")
+	   (source libsodium-komodo-origin-get)
+	   (build-system cmake-build-system)
+	   (arguments libsodium-komodo-arguments)
+	   (native-inputs libsodium-komodo-native-inputs-get)))
+
 (define wally
   (package (name get-wally-name)
 	   (version get-wally-version)