futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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 @@ cannot be adequately worked around on the client side of the wire.")
(base32 (base32
"0azqxllcsfxc3ilhz6kwc6x7m8wc477p59ir9p0yrsldx766zbar")))) "0azqxllcsfxc3ilhz6kwc6x7m8wc477p59ir9p0yrsldx766zbar"))))
(build-system gnu-build-system) (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 (propagated-inputs
`(("xorgproto" ,xorgproto))) `(("xorgproto" ,xorgproto)))
(inputs (inputs
@ -4637,6 +4644,13 @@ cannot be adequately worked around on the client side of the wire.")
(base32 (base32
"0j89cnb06g8x79wmmnwzykgkkfdhin9j7hjpvsxwlr3fz1wmjvf0")))) "0j89cnb06g8x79wmmnwzykgkkfdhin9j7hjpvsxwlr3fz1wmjvf0"))))
(build-system gnu-build-system) (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 (propagated-inputs
`(("xorgproto" ,xorgproto))) `(("xorgproto" ,xorgproto)))
(inputs (inputs
@ -5245,16 +5259,22 @@ draggable titlebars and borders.")
(outputs '("out" (outputs '("out"
"doc")) ;8 MiB of man pages + XML "doc")) ;8 MiB of man pages + XML
(arguments (arguments
'(#:configure-flags (list (string-append "--mandir=" `(#:configure-flags
(assoc-ref %outputs "doc") (list (string-append "--mandir="
"/share/man")))) (assoc-ref %outputs "doc")
"/share/man")
;; Disable zero malloc check that fails when cross-compiling.
,@(if (%current-target-system)
'("--disable-malloc0returnsnull")
'()))))
(propagated-inputs (propagated-inputs
`(("xorgproto" ,xorgproto) `(("xorgproto" ,xorgproto)
("libxcb" ,libxcb))) ("libxcb" ,libxcb)))
(inputs (inputs
`(("xtrans" ,xtrans))) `(("xtrans" ,xtrans)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)
("xorgproto" ,xorgproto)))
(home-page "https://www.x.org/wiki/") (home-page "https://www.x.org/wiki/")
(synopsis "Xorg Core X11 protocol client library") (synopsis "Xorg Core X11 protocol client library")
(description "Xorg Core X11 protocol client library.") (description "Xorg Core X11 protocol client library.")