summaryrefslogtreecommitdiff
path: root/gnu/packages
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2024-12-05 14:07:47 +0200
committerEfraim Flashner <efraim@flashner.co.il>2024-12-05 14:07:47 +0200
commitd3c929a4bd58d073bf4f83bf2aff2f8db92b33dd (patch)
tree440b671f8c18ed0f35062206b88d2b0956314daa /gnu/packages
parentbe53521d4cc9fb1adbbb97f00ae7a809710b4c79 (diff)
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
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/rust.scm18
1 files changed, 7 insertions, 11 deletions
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index 345d61dbf54..594dc7e7150 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
1614 #:with-winpthreads? #t))) 1614 #:with-winpthreads? #t)))
1615 (package-propagated-inputs base-rust))) 1615 (package-propagated-inputs base-rust)))
1616 (native-inputs 1616 (native-inputs
1617 (if (target-mingw? target) 1617 (modify-inputs (package-native-inputs base-rust)
1618 (modify-inputs (package-native-inputs base-rust) 1618 (prepend (cross-gcc target
1619 (prepend (cross-gcc target 1619 #:libc (cross-libc target)))
1620 #:libc (cross-libc target)) 1620 (prepend (if (target-mingw? target)
1621 (cross-binutils target)
1622 (make-mingw-w64 1621 (make-mingw-w64
1623 (string-take target (string-index target #\-)) 1622 (string-take target (string-index target #\-))
1624 #:with-winpthreads? #t))) 1623 #:with-winpthreads? #t)
1625 (modify-inputs (package-native-inputs base-rust) 1624 (cross-libc target)))
1626 (prepend (cross-gcc target 1625 (prepend (cross-binutils target))))
1627 #:libc (cross-libc target))
1628 (cross-libc target)
1629 (cross-binutils target)))))
1630 (properties 1626 (properties
1631 `((hidden? . #t) ,(package-properties base-rust)))))) 1627 `((hidden? . #t) ,(package-properties base-rust))))))
1632 1628