diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-12-18 03:58:23 +0100 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-12-18 03:58:23 +0100 |
| commit | 256d5b3598fa2162e9712fc98781d2cb4ceda31e (patch) | |
| tree | 0e7f7051a59aad879561b5c4ee885e24d3c04bc6 /gnu/packages/xorg.scm | |
| parent | 9f6210cc5c114310a38ad1cc0ff5900409a7e7cc (diff) | |
| parent | 1a9f267f51f97b8ca7049aa72763ddd64aad5b62 (diff) | |
Merge branch 'master' into wip-webkitwip-webkit
Diffstat (limited to 'gnu/packages/xorg.scm')
| -rw-r--r-- | gnu/packages/xorg.scm | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 4efde55ba8..382075237a 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1498,7 +1498,11 @@ treat it as part of their software base when porting.") "1zi0r6mqa1g0hhsp02cdsjcxmsbipiv0v65c1h4pl84fydcjikbm")))) (build-system gnu-build-system) (arguments - '(#:configure-flags '("--disable-static"))) + `(#:configure-flags '("--disable-static" + ;; This fixes cross compiling. + ,@(if (%current-target-system) + '("--enable-malloc0returnsnull=yes") + '())))) (propagated-inputs (list libx11 libxext xorgproto)) (native-inputs @@ -5013,7 +5017,7 @@ by the Xorg server.") (define-public xorg-server (package (name "xorg-server") - (version "21.1.9") + (version "21.1.10") (source (origin (method url-fetch) @@ -5021,7 +5025,7 @@ by the Xorg server.") "/xserver/xorg-server-" version ".tar.xz")) (sha256 (base32 - "0fjk9ggcrn96blq0bm80739yj23s3gjjjsc0nxk4jk0v07i7nsgz")) + "1l0iaq83vbl9jr34sa7v7630c5bnp64drlw8yg6c6yn5xyib7c6f")) (patches (list ;; See: |