From f58b2f38e4dfdbb8473fb2816d44fae6ad9cbc79 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 12 Sep 2019 20:20:26 +0300 Subject: build: cargo-build-system: Strip store hash from vendor-dir. * guix/build/cargo-build-system.scm (configure): When copying the sources into the vendor-dir strip off the hash before the package name. --- guix/build/cargo-build-system.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'guix/build') diff --git a/guix/build/cargo-build-system.scm b/guix/build/cargo-build-system.scm index f173b64c83..0134997c27 100644 --- a/guix/build/cargo-build-system.scm +++ b/guix/build/cargo-build-system.scm @@ -99,7 +99,7 @@ (define* (configure #:key inputs (for-each (match-lambda ((name . path) - (let* ((basepath (basename path)) + (let* ((basepath (string-drop (basename path) 33)) (crate-dir (string-append vendor-dir "/" basepath))) (and (crate-src? path) ;; Gracefully handle duplicate inputs -- cgit v1.2.3 From 43ffa11fdc4de4197a1096f6ebc4067115f9eb26 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 13 Sep 2019 15:05:10 +0300 Subject: build-system/cargo: Use 'strip-store-file-name'. This is a follow-up to f58b2f38e4dfdbb8473fb2816d44fae6ad9cbc79. * guix/build/cargo-build-system.scm (configure): Use bespoke 'strip-store-file-name' function. --- guix/build/cargo-build-system.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'guix/build') diff --git a/guix/build/cargo-build-system.scm b/guix/build/cargo-build-system.scm index 0134997c27..c69cae5afd 100644 --- a/guix/build/cargo-build-system.scm +++ b/guix/build/cargo-build-system.scm @@ -99,7 +99,7 @@ (define* (configure #:key inputs (for-each (match-lambda ((name . path) - (let* ((basepath (string-drop (basename path) 33)) + (let* ((basepath (strip-store-file-name path)) (crate-dir (string-append vendor-dir "/" basepath))) (and (crate-src? path) ;; Gracefully handle duplicate inputs -- cgit v1.2.3 From 3af85f832dd007296ec64ddc34beadd397481311 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 13 Sep 2019 15:09:34 +0300 Subject: build-system/cargo: Remove unused function. * guix/build/cargo-build-system.scm (touch): Remove it. --- guix/build/cargo-build-system.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'guix/build') diff --git a/guix/build/cargo-build-system.scm b/guix/build/cargo-build-system.scm index c69cae5afd..4be5443083 100644 --- a/guix/build/cargo-build-system.scm +++ b/guix/build/cargo-build-system.scm @@ -168,9 +168,6 @@ (define* (check #:key (apply invoke `("cargo" "test" ,@cargo-test-flags)) #t)) -(define (touch file-name) - (call-with-output-file file-name (const #t))) - (define* (install #:key inputs outputs skip-build? #:allow-other-keys) "Install a given Cargo package." (let* ((out (assoc-ref outputs "out"))) -- cgit v1.2.3