From d3c929a4bd58d073bf4f83bf2aff2f8db92b33dd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 5 Dec 2024 14:07:47 +0200 Subject: [PATCH] gnu: make-rust-sysroot: Simplify native-inputs. * gnu/packages/rust.scm (make-rust-sysroot/implementation) [native-inputs]: Combine the different modify-input branches into one. Change-Id: Ia7df5d1566099f9934a76b2660f46a55547c88b9 --- gnu/packages/rust.scm | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 345d61dbf5..594dc7e715 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -1614,19 +1614,15 @@ ar = \"" (search-input-file inputs (string-append "/bin/" #$(ar-for-target targe #:with-winpthreads? #t))) (package-propagated-inputs base-rust))) (native-inputs - (if (target-mingw? target) - (modify-inputs (package-native-inputs base-rust) - (prepend (cross-gcc target - #:libc (cross-libc target)) - (cross-binutils target) + (modify-inputs (package-native-inputs base-rust) + (prepend (cross-gcc target + #:libc (cross-libc target))) + (prepend (if (target-mingw? target) (make-mingw-w64 (string-take target (string-index target #\-)) - #:with-winpthreads? #t))) - (modify-inputs (package-native-inputs base-rust) - (prepend (cross-gcc target - #:libc (cross-libc target)) - (cross-libc target) - (cross-binutils target))))) + #:with-winpthreads? #t) + (cross-libc target))) + (prepend (cross-binutils target)))) (properties `((hidden? . #t) ,(package-properties base-rust))))))