From 32d8ab65eefd2967554be2c24c689cc7fc0afbc4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 10 Nov 2021 19:48:12 +0200 Subject: build: cargo-build-system: Don't try to package when skipping build. * guix/build/cargo-build-system.scm (package): If the package isn't going to be built then use the source instead. --- guix/build/cargo-build-system.scm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/guix/build/cargo-build-system.scm b/guix/build/cargo-build-system.scm index 0a95672b00..464ef2ab0b 100644 --- a/guix/build/cargo-build-system.scm +++ b/guix/build/cargo-build-system.scm @@ -209,12 +209,26 @@ (define* (check #:key #t)) (define* (package #:key + source + skip-build? install-source? (cargo-package-flags '("--no-metadata" "--no-verify")) #:allow-other-keys) "Run 'cargo-package' for a given Cargo package." (if install-source? - (apply invoke `("cargo" "package" ,@cargo-package-flags)) + (if skip-build? + (begin + (install-file source "target/package") + (with-directory-excursion "target/package" + (for-each + (lambda (file) + (make-file-writable file) + (rename-file file + (string-append (string-drop-right + (string-drop file 35) + 7) ".crate"))) + (find-files "." "\\.tar\\.gz")))) + (apply invoke `("cargo" "package" ,@cargo-package-flags))) (format #t "Not installing cargo sources, skipping `cargo package`.~%")) #t) -- cgit v1.2.3