1
0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-07 05:30:38 +02:00

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
This commit is contained in:
Efraim Flashner
2024-12-05 14:07:47 +02:00
parent be53521d4c
commit d3c929a4bd

View File

@@ -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))))))