~ruther/guix-local

a90e2453d5c358e29ca5280c31e78f86ce40375d — Maxim Cournoyer 2 months ago d7dac39 
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
patch browse .tar.gz 
3 files changed, 19 insertions(+), 1 deletions(-)

M gnu/local.mk
M gnu/packages/nx.scm
A gnu/packages/patches/x2goclient-fix-makefile.patch

M gnu/local.mk => gnu/local.mk +1 -0
@@ 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\


M gnu/packages/nx.scm => gnu/packages/nx.scm +3 -1
@@ 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


A gnu/packages/patches/x2goclient-fix-makefile.patch => gnu/packages/patches/x2goclient-fix-makefile.patch +15 -0
@@ 0,0 1,15 @@
Retrieved from <https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=1089277;filename=x2goclient.diff.txt;msg=14>

Upstream-status: <https://gitlab.x2go.org/x2go/client/x2goclient/-/issues/4>

--- 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