From a90e2453d5c358e29ca5280c31e78f86ce40375d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 18 Dec 2025 15:58:07 +0900 Subject: [PATCH] gnu: x2goclient: Fix build. * gnu/packages/patches/x2goclient-fix-makefile.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/nx.scm (x2goclient): Apply it. Fixes: #4586 Change-Id: Ib76ac5acd99cbde806f961b4e8107eb37f755304 --- gnu/local.mk | 1 + gnu/packages/nx.scm | 4 +++- .../patches/x2goclient-fix-makefile.patch | 15 +++++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/x2goclient-fix-makefile.patch diff --git a/gnu/local.mk b/gnu/local.mk index 7f15dd7218b31245a1be0e572c4b3c885ad8bed1..4afa93eed0ce0bfcd55f0e103e99f45652fd43ca 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2488,6 +2488,7 @@ dist_patch_DATA = \ %D%/packages/patches/wordnet-CVE-2008-3908-pt1.patch \ %D%/packages/patches/wordnet-CVE-2008-3908-pt2.patch \ %D%/packages/patches/wpa-supplicant-dbus-group-policy.patch \ + %D%/packages/patches/x2goclient-fix-makefile.patch \ %D%/packages/patches/x265-arm-flags.patch \ %D%/packages/patches/x265-4-arm-flags.patch \ %D%/packages/patches/xdg-desktop-portal-disable-portal-tests.patch\ diff --git a/gnu/packages/nx.scm b/gnu/packages/nx.scm index 8ef5158ef71c4145188e3991d7cf02fdef2c9e8f..fdfabae6c8e895eb4e0d3e0b2fbc02299856f346 100644 --- a/gnu/packages/nx.scm +++ b/gnu/packages/nx.scm @@ -22,6 +22,7 @@ #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages bash) @@ -172,7 +173,8 @@ Helper script "https://code.x2go.org/releases/source/x2goclient/x2goclient-" version ".tar.gz")) (sha256 - (base32 "0g6aba8kpsixq4486a8mga945lp31y0mzwa2krs5qqiiip3v72xb")))) + (base32 "0g6aba8kpsixq4486a8mga945lp31y0mzwa2krs5qqiiip3v72xb")) + (patches (search-patches "x2goclient-fix-makefile.patch")))) (build-system gnu-build-system) (arguments (list diff --git a/gnu/packages/patches/x2goclient-fix-makefile.patch b/gnu/packages/patches/x2goclient-fix-makefile.patch new file mode 100644 index 0000000000000000000000000000000000000000..14a1eacdbcaf12510715c3671a9ad87e69cae046 --- /dev/null +++ b/gnu/packages/patches/x2goclient-fix-makefile.patch @@ -0,0 +1,15 @@ +Retrieved from + +Upstream-status: + +--- a/Makefile ++++ b/Makefile +@@ -65,7 +65,7 @@ + # implementation to make implementation. + + # GNU make way. +-MAKEOVERRIDES = SHELL QT_VERSION INSTALL_DIR INSTALL_FILE INSTALL_SYMLINK INSTALL_PROGRAM RM_FILE RM_DIR DESTDIR PREFIX ETCDIR BINDIR SHAREDIR MANDIR QMAKE_BINARY LRELEASE_BINARY QMAKE_OPTS LDFLAGS LIBS ++# MAKEOVERRIDES = SHELL QT_VERSION INSTALL_DIR INSTALL_FILE INSTALL_SYMLINK INSTALL_PROGRAM RM_FILE RM_DIR DESTDIR PREFIX ETCDIR BINDIR SHAREDIR MANDIR QMAKE_BINARY LRELEASE_BINARY QMAKE_OPTS LDFLAGS LIBS + + # FreeBSD and NetBSD way. + .MAKEOVERRIDES = SHELL QT_VERSION INSTALL_DIR INSTALL_FILE INSTALL_SYMLINK INSTALL_PROGRAM RM_FILE RM_DIR DESTDIR PREFIX ETCDIR BINDIR SHAREDIR MANDIR QMAKE_BINARY LRELEASE_BINARY QMAKE_OPTS LDFLAGS LIBS