From b777821c7c6f221c40a422b2165157877154c224 Mon Sep 17 00:00:00 2001 From: Marek Paśnikowski Date: Fri, 15 Mar 2024 00:07:07 +0100 Subject: Restore validity of komodo definition --- private/komodo/komodo.scm | 160 +++++++++++++++++++++++----------------------- 1 file changed, 80 insertions(+), 80 deletions(-) diff --git a/private/komodo/komodo.scm b/private/komodo/komodo.scm index bc155edc30..a8b0ab293a 100644 --- a/private/komodo/komodo.scm +++ b/private/komodo/komodo.scm @@ -10,8 +10,8 @@ ;; #:use-module (guix build-system copy) #:use-module (guix build-system cmake) ;; #:use-module (guix build-system qt) - ;; #:use-module (guix download) - ;; #:use-module (guix gexp) + #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) @@ -39,84 +39,84 @@ "148fxnhsvqpgfc6jmj7qzz5504k3yqvn1jxqkqdxqmk0ch0abpd7")))) (build-system cmake-build-system) (arguments - `(#:configure-flags '("-DCMAKE_USE_SYSTEM_CPPDAP=OFF") - #: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")))))) + (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 -- cgit v1.2.3