diff options
author | John Kehayias <john.kehayias@protonmail.com> | 2024-01-04 00:03:40 -0500 |
---|---|---|
committer | John Kehayias <john.kehayias@protonmail.com> | 2024-01-04 00:03:40 -0500 |
commit | ef4e4c9a2ccc1678182fa6e4409fff13c669fd14 (patch) | |
tree | d1f097787a69fa3a7089f26ecfed8b5c267883db /gnu/packages/xorg.scm | |
parent | 42c448ee6e13d165807d83e8c48941bead4847c1 (diff) | |
parent | 7b0863f07a113caef26fea13909bd97d250b629e (diff) | |
download | guix-ef4e4c9a2ccc1678182fa6e4409fff13c669fd14.tar.gz guix-ef4e4c9a2ccc1678182fa6e4409fff13c669fd14.zip |
Merge branch 'master' into mesa-updates
Change-Id: I46ca25bea98d25150877421c6d5161752afabb25
Diffstat (limited to 'gnu/packages/xorg.scm')
-rw-r--r-- | gnu/packages/xorg.scm | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index a761fb2fbd..9624fb44aa 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5677,11 +5677,29 @@ The XCB util-keysyms module provides the following library: "0nza1csdvvxbmk8vgv8vpmq7q8h05xrw3cfx9lwxd1hjzd47xsf6")))) (build-system gnu-build-system) (arguments - '(#:configure-flags '("--disable-static"))) + `(#:configure-flags '("--disable-static") + ,@(if (and (%current-target-system) + (target-riscv64?)) + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'update-config-scripts + (lambda* (#:key inputs native-inputs #:allow-other-keys) + ;; Replace outdated config.guess and config.sub. + (for-each (lambda (file) + (install-file + (search-input-file + (or native-inputs inputs) + (string-append "/bin/" file)) ".")) + '("config.guess" "config.sub")))))) + '()))) (propagated-inputs (list libxcb)) (native-inputs - (list pkg-config)) + (append (if (and (%current-target-system) + (target-riscv64?)) + (list config) + '()) + (list pkg-config))) (home-page "https://cgit.freedesktop.org/xcb/util-renderutil/") (synopsis "Convenience functions for the Render extension") (description |