From a838089f6ba39e5754466d1f0c18bd2e74bb2806 Mon Sep 17 00:00:00 2001 From: Marek Paśnikowski Date: Sat, 16 Mar 2024 00:05:57 +0100 Subject: Breakthrough: work around VCPKG by commenting out the include{vcpkg…) instruction MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- private/komodo/komodo.scm | 95 ++++++----------------------------------------- 1 file changed, 12 insertions(+), 83 deletions(-) diff --git a/private/komodo/komodo.scm b/private/komodo/komodo.scm index a8b0ab293a..842b29131a 100644 --- a/private/komodo/komodo.scm +++ b/private/komodo/komodo.scm @@ -1,5 +1,5 @@ (define-module (komodo) - #:use-module (cmake) + ;; #:use-module (cmake) ;; #:use-module (gnu packages commencement) #:use-module (gnu packages compression) ;; #:use-module (gnu packages cpp) @@ -31,8 +31,7 @@ (git-reference (url "https://github.com/KomodoPlatform/komodo-wallet-desktop") - (commit version) - (recursive? #t))) + (commit version))) (method git-fetch) (hash (content-hash @@ -41,86 +40,16 @@ (arguments (list #:phases - #~ (modify-phases - %standard-phases - (add-after - 'unpack - 'unpack-vcpkg-tool - (lambda _ - (invoke "mkdir" "ci_tools_atomic_dex/vcpkg-repo/downloads") - (copy-recursively - #+ (origin - (uri - (string-append - "https://github.com/microsoft/vcpkg-tool/archive/" - "2023-11-16" - ".tar.gz")) - (method url-fetch) - (hash - (content-hash - "0gy04mlc8s2560zm9ngjx7p3rbrckk9zxb2g1z0hidkbhgv49lcy"))) - "ci_tools_atomic_dex/vcpkg-repo/downloads/2023-11-16.tar.gz"))) - (add-after - 'unpack-vcpkg-tool - 'patch-vcpkg-tool - (lambda _ - (invoke - "chmod" "+w" - "ci_tools_atomic_dex/vcpkg-repo/downloads/2023-11-16.tar.gz") - (invoke - "gunzip" - "ci_tools_atomic_dex/vcpkg-repo/downloads/2023-11-16.tar.gz") - (invoke - "tar" "-xf" - "ci_tools_atomic_dex/vcpkg-repo/downloads/2023-11-16.tar" - "-C" "ci_tools_atomic_dex/vcpkg-repo/downloads" - "vcpkg-tool-2023-11-16/cmake/Findfmt.cmake" - "vcpkg-tool-2023-11-16/cmake/FindCMakeRC.cmake") - (invoke - "tar" "--delete" "-f" - "ci_tools_atomic_dex/vcpkg-repo/downloads/2023-11-16.tar" - "vcpkg-tool-2023-11-16/cmake/Findfmt.cmake" - "vcpkg-tool-2023-11-16/cmake/FindCMakeRC.cmake") - (substitute* - "ci_tools_atomic_dex/vcpkg-repo/downloads/vcpkg-tool-2023-11-16/cmake/Findfmt.cmake" - (("the fmt library\" OFF") - "the fmt library\" ON")) - (substitute* - "ci_tools_atomic_dex/vcpkg-repo/downloads/vcpkg-tool-2023-11-16/cmake/FindCMakeRC.cmake" - (("resource compiler\" OFF") - "resource compiler\" ON")) - (invoke - "tar" "-rf" - "ci_tools_atomic_dex/vcpkg-repo/downloads/2023-11-16.tar" - "ci_tools_atomic_dex/vcpkg-repo/downloads/vcpkg-tool-2023-11-16/cmake/Findfmt.cmake" - "ci_tools_atomic_dex/vcpkg-repo/downloads/vcpkg-tool-2023-11-16/cmake/FindCMakeRC.cmake") - (invoke - "gzip" - "ci_tools_atomic_dex/vcpkg-repo/downloads/2023-11-16.tar"))) - (add-after - 'unpack - 'prepare-vcpkg-bootstrap - (lambda _ - (invoke - "chmod" "+x" - "ci_tools_atomic_dex/vcpkg-repo/scripts/bootstrap.sh") - (substitute* - "ci_tools_atomic_dex/vcpkg-repo/scripts/bootstrap.sh" - (("vcpkgDownloadTool=\"ON\"") - "vcpkgDownloadTool=\"OFF\"") - (("\\$actualHash") - "$expectedHash")))) - (add-before - 'configure - 'bootstrap-vcpkg - (lambda _ - (invoke - "ci_tools_atomic_dex/vcpkg-repo/bootstrap-vcpkg.sh" - "--disableMetrics")))))) - (native-inputs - (list - cmake curl ncurses ninja unzip vcpkg-tool-cmrc - vcpkg-tool-fmt zip)) + '(modify-phases + %standard-phases + (add-after + 'unpack + 'delete-vcpkg + (lambda _ + (substitute* + "CMakeLists.txt" + (("include\\(vcpkg_prerequisites\\)") + "# include(vcpkg_prerequisites)"))))))) (synopsis "Komodo Wallet Desktop GUI") (description (string-append -- cgit v1.2.3