ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-04 02:19:18 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: xorg: Fix cross-compilation of multiple packages.

Browse source 
* gnu/packages/xorg.scm (libxext)[arguments]: Disable zero malloc check that
fails when cross-compiling,
(libxrender)[arguments]: ditto,
(libx11)[arguments]: ditto.
This commit is contained in:
Mathieu Othacehe 2019-06-26 18:43:22 +02:00
parent da66bd3857
commit d7c5364732
No known key found for this signature in database
GPG key ID: 8354763531769CA6
1 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
gnu/packages/xorg.scm
View file

@ -4552,6 +4552,13 @@ (define-public libxext
(base32
"0azqxllcsfxc3ilhz6kwc6x7m8wc477p59ir9p0yrsldx766zbar"))))
(build-system gnu-build-system)
;; Disable zero malloc check that fails when cross-compiling.
(arguments
`(#:configure-flags
(list
,@(if (%current-target-system)
'("--disable-malloc0returnsnull")
'()))))
(propagated-inputs
`(("xorgproto" ,xorgproto)))
(inputs
@ -4637,6 +4644,13 @@ (define-public libxrender
(base32
"0j89cnb06g8x79wmmnwzykgkkfdhin9j7hjpvsxwlr3fz1wmjvf0"))))
(build-system gnu-build-system)
;; Disable zero malloc check that fails when cross-compiling.
(arguments
`(#:configure-flags
(list
,@(if (%current-target-system)
'("--disable-malloc0returnsnull")
'()))))
(propagated-inputs
`(("xorgproto" ,xorgproto)))
(inputs
@ -5245,16 +5259,22 @@ (define-public libx11
(outputs '("out"
"doc")) ;8 MiB of man pages + XML
(arguments
'(#:configure-flags (list (string-append "--mandir="
(assoc-ref %outputs "doc")
"/share/man"))))
`(#:configure-flags
(list (string-append "--mandir="
(assoc-ref %outputs "doc")
"/share/man")
;; Disable zero malloc check that fails when cross-compiling.
,@(if (%current-target-system)
'("--disable-malloc0returnsnull")
'()))))
(propagated-inputs
`(("xorgproto" ,xorgproto)
("libxcb" ,libxcb)))
(inputs
`(("xtrans" ,xtrans)))
(native-inputs
`(("pkg-config" ,pkg-config)))
`(("pkg-config" ,pkg-config)
("xorgproto" ,xorgproto)))
(home-page "https://www.x.org/wiki/")
(synopsis "Xorg Core X11 protocol client library")
(description "Xorg Core X11 protocol client library.")