efraim pushed a commit to branch master
in repository guix.
commit 9c3feb3773ac9af09db3815b6410ce565f9cf70c
Author: Efraim Flashner <[email protected]>
AuthorDate: Sun Dec 1 09:04:21 2024 +0200
gnu: xorgxrdp: Only build with nasm on necessary platforms.
* gnu/packages/rdesktop.scm (xorgxrdp)[native-inputs]: Only include nasm
on platforms which need it.
Change-Id: I00778cf4b53776754525d42e0586076d4f2be61b
---
gnu/packages/rdesktop.scm | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/rdesktop.scm b/gnu/packages/rdesktop.scm
index 8024156417..23a950dad3 100644
--- a/gnu/packages/rdesktop.scm
+++ b/gnu/packages/rdesktop.scm
@@ -2,7 +2,7 @@
;;; Copyright © 2015 Ludovic Courtès <[email protected]>
;;; Copyright © 2017 Thomas Danckaert <[email protected]>
;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <[email protected]>
-;;; Copyright © 2018 Efraim Flashner <[email protected]>
+;;; Copyright © 2018, 2024 Efraim Flashner <[email protected]>
;;; Copyright © 2019 Leo Famulari <[email protected]>
;;; Copyright © 2019 Eric Bavier <[email protected]>
;;; Copyright © 2023 Maxim Cournoyer <[email protected]>
@@ -255,13 +255,17 @@ variety of RDP clients:
xdpyinfo
xorg-server
xrdp))
- (native-inputs (list autoconf
- automake
- intltool
- libtool
- nasm
- pkg-config
- pixman))
+ (native-inputs
+ (append
+ (list autoconf
+ automake
+ intltool
+ libtool)
+ (if (target-x86?)
+ (list nasm)
+ '())
+ (list pkg-config
+ pixman)))
(arguments
(list #:configure-flags #~(list "--enable-strict-locations=yes"
(string-append "XRDP_CFLAGS=-I"
