nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: bootstrap-tarballs: Adjust to static outputs of zlib and libunistring. 

* gnu/packages/make-bootstrap.scm (%gcc-static)[inputs]: Add ZLIB:STATIC.
(%guile-static)[inputs]: Add LIBUNISTRING:STATIC.
This commit is contained in:
Marius Bakke 2018-08-21 03:20:19 +02:00
parent c0b3867c21
commit 3f35e0da86
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gnu/packages/make-bootstrap.scm
View File

@ -22,7 +22,7 @@
(define-module (gnu packages make-bootstrap)
#:use-module (guix utils)
#:use-module (guix packages)
#:use-module (guix licenses)
#:use-module ((guix licenses) #:select (gpl3+))
#:use-module (guix build-system trivial)
#:use-module (guix build-system gnu)
#:use-module ((gnu packages) #:select (search-patch))
@ -34,6 +34,7 @@
#:use-module (gnu packages gcc)
#:use-module (gnu packages guile)
#:use-module (gnu packages bdw-gc)
#:use-module (gnu packages libunistring)
#:use-module (gnu packages linux)
#:use-module (gnu packages hurd)
#:use-module (gnu packages multiprecision)
@ -440,6 +441,9 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
"^gnu-user.*\\.h$"))
((" -lgcc_s}}") "}}"))
#t)))))))
(inputs
`(("zlib:static" ,zlib "static")
,@(package-inputs gcc)))
(native-inputs
(if (%current-target-system)
`(;; When doing a Canadian cross, we need GMP/MPFR/MPC both
@ -525,6 +529,10 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
;; Remove the 'debug' output (see above for the reason.)
(outputs (delete "debug" (package-outputs guile-2.2)))
(inputs
`(("libunistring:static" ,libunistring "static")
,@(package-inputs guile-2.2)))
(propagated-inputs
`(("bdw-gc" ,libgc)
,@(alist-delete "bdw-gc"