amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: guix: Fix cross-compilation.

Browse source 
This is a follow-up of 375cc7dea2.

Avahi requires "glib" which doesn't cross-compile yet.

* gnu/packages/package-management.scm (guix)[arguments]: Remove "guile-avahi"
from the wrapper when cross-compiling.
[native-inputs]: Remove "guile-avahi" when cross-compiling.
[propagated-inputs]: Ditto.
This commit is contained in:
Mathieu Othacehe 2020-11-29 17:46:55 +01:00
parent b588bb0756
commit d9f05c70a6
No known key found for this signature in database
GPG key ID: 8354763531769CA6
1 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
gnu/packages/package-management.scm
View file

@ -306,8 +306,11 @@ $(prefix)/etc/init.d\n")))
(ssh (assoc-ref inputs "guile-ssh")) (ssh (assoc-ref inputs "guile-ssh"))
(gnutls (assoc-ref inputs "gnutls")) (gnutls (assoc-ref inputs "gnutls"))
(locales (assoc-ref inputs "glibc-utf8-locales")) (locales (assoc-ref inputs "glibc-utf8-locales"))
(deps (list avahi gcrypt json sqlite gnutls (deps (list gcrypt json sqlite gnutls git
git bs ssh zlib lzlib)) bs ssh zlib lzlib))
(deps* ,@(if (%current-target-system)
'(deps)
'((cons avahi deps))))
(effective (effective
(read-line (read-line
(open-pipe* OPEN_READ (open-pipe* OPEN_READ
@ -317,13 +320,13 @@ $(prefix)/etc/init.d\n")))
(map (cut string-append <> (map (cut string-append <>
"/share/guile/site/" "/share/guile/site/"
effective) effective)
(delete #f deps)) (delete #f deps*))
":")) ":"))
(gopath (string-join (gopath (string-join
(map (cut string-append <> (map (cut string-append <>
"/lib/guile/" effective "/lib/guile/" effective
"/site-ccache") "/site-ccache")
(delete #f deps)) (delete #f deps*))
":")) ":"))
(locpath (string-append locales "/lib/locale"))) (locpath (string-append locales "/lib/locale")))
@ -350,7 +353,9 @@ $(prefix)/etc/init.d\n")))
;; cross-compilation. ;; cross-compilation.
("guile" ,guile-3.0-latest) ;for faster builds ("guile" ,guile-3.0-latest) ;for faster builds
("gnutls" ,gnutls) ("gnutls" ,gnutls)
("guile-avahi" ,guile-avahi) ,@(if (%current-target-system)
'()
`(("guile-avahi" ,guile-avahi)))
("guile-gcrypt" ,guile-gcrypt) ("guile-gcrypt" ,guile-gcrypt)
("guile-json" ,guile-json-4) ("guile-json" ,guile-json-4)
("guile-sqlite3" ,guile-sqlite3) ("guile-sqlite3" ,guile-sqlite3)
@ -401,7 +406,10 @@ $(prefix)/etc/init.d\n")))
("glibc-utf8-locales" ,glibc-utf8-locales))) ("glibc-utf8-locales" ,glibc-utf8-locales)))
(propagated-inputs (propagated-inputs
`(("gnutls" ,(if (%current-target-system) gnutls-3.6.14 gnutls)) `(("gnutls" ,(if (%current-target-system) gnutls-3.6.14 gnutls))
("guile-avahi" ,guile-avahi) ;; Avahi requires "glib" which doesn't cross-compile yet.
,@(if (%current-target-system)
'()
`(("guile-avahi" ,guile-avahi)))
("guile-gcrypt" ,guile-gcrypt) ("guile-gcrypt" ,guile-gcrypt)
("guile-json" ,guile-json-4) ("guile-json" ,guile-json-4)
("guile-sqlite3" ,guile-sqlite3) ("guile-sqlite3" ,guile-sqlite3)