Toggle snippet (228 lines)
modified gnu/local.mk
@@ -487,6 +487,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/ntp.scm \
%D%/packages/nutrition.scm \
%D%/packages/nvi.scm \
+ %D%/packages/nx.scm \
%D%/packages/ocaml.scm \
%D%/packages/ocr.scm \
%D%/packages/openkinect.scm \
modified gnu/packages/nx.scm
@@ -1,4 +1,6 @@
;;; This file is part of GNU Guix.
+;;; Copyright © 2024 Nicolas Debonnaire <nicolas.debonnaire@gmail.com>
+;;; Copyright © 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by
@@ -14,13 +16,14 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages nx)
- #:use-module (guix build utils)
#:use-module (guix build-system gnu)
#:use-module (guix download)
+ #:use-module (guix gexp)
#:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (gnu packages autotools)
+ #:use-module (gnu packages base)
#:use-module (gnu packages commencement)
#:use-module (gnu packages cups)
#:use-module (gnu packages glib)
@@ -54,95 +57,104 @@ (define-public nx-libs
(base32 "0ykbza39ksycpyydaiwwbp7hkmdk96v7b36pn989k39lhfwnn8kz"))))
(build-system gnu-build-system)
(arguments
- `(#:tests? #f ;; no tests in this project
- #:phases (modify-phases %standard-phases
- (delete 'configure)
- (add-before 'build 'replace-shebang-nxdialog
- (lambda _
- (substitute* "nxdialog/bin/nxdialog"
- (("#!/usr/bin/env python")
- (string-append "#!"
- (which "python3"))))))
- (add-before 'build 'fix-makefile
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (etc (string-append out "/etc")))
- (mkdir-p etc)
- (substitute* "Makefile"
- (("^gzip -f") "gzip -f -n") ;; reproducible build
- (("/usr/local")
- out)
- (("/etc/nxagent")
- etc)
- (("./configure")
- (string-append "CONFIG_SHELL="
- (which "sh")
- " SHELL="
- (which "sh")
- " "
- (which "sh")
- " ./configure")))
- (substitute* '("nx-X11/config/cf/site.def")
- (("#include <host.def>")
- (string-append "#include <host.def>" "\n"
- "#define BourneShell "
- (which "sh")))
- (("/usr/local")
- out))
- ;; Workaround the following error during the build
- ;; process: invalid input: ("_" #<procedure which (program)>)
- (substitute* '("nx-X11/Makefile")
- (("which")
- "echo"))
- #t)))
- (replace 'build
- (lambda _
- (invoke "make" "IMAKE_DEFINES=\"-DUseTIRPC=1\"") #t))
- (add-before 'validate-runpath 'link-libraries
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (lib (string-append out "/lib"))
- (lib-nx-x11 (string-append lib "/nx/X11")))
- ;; TODO: Should I use symlink instead of install-file ?
- (for-each (lambda (file)
- (install-file file lib-nx-x11))
- (list (string-append lib "/libXcomp.so.3")
- (string-append lib
- "/libXcompshad.so.3")
- (string-append lib "/libNX_X11.so.6")))
- #t))))))
- (inputs (list perl
- python
- python-pygobject
- gtk+))
- (native-inputs (list autoconf
- automake
- libtool
- pkg-config
- libpng
- libjpeg-turbo
- xkbcomp
- libxfont
- libxdamage
- libxrandr
- libxtst
- libxext
- libxcomposite
- libxinerama
- libxpm
- libxml2
- font-util
- pixman
- gccmakedep
- imake
- quilt
- libtirpc
- gcc-toolchain))
- (synopsis "NX remote desktop library")
- (description
- "NX technology also known as NX or NoMachine is a protocol that enables
-remote desktop access. It's maintained by the artica project, x2go
-developers and TheQVD.")
+ (list
+ #:tests? #f ;no test suite
+ ;; The build randomly fails when run in parallel (see:
+ ;; https://github.com/ArcticaProject/nx-libs/issues/1072).
+ #:parallel-build? #f
+ #:make-flags #~(let ((sh (search-input-file %build-inputs "bin/sh")))
+ (list (string-append "PREFIX=" #$output)
+ (string-append "ETCDIR_NX=" #$output "/etc")
+ (string-append "LOCAL_LDFLAGS=-Wl,"
+ "-rpath=" #$output "/lib,"
+ "-rpath=" #$output "/lib/nx/X11")
+ (string-append "IMAKE_DEFINES=-DUseTIRPC=1"
+ " -DBourneShell=" sh
+ " -DProjectRoot=" #$output
+ " -DDefaultUserPath="
+ #$output "/bin")
+ (string-append "CONFIG_SHELL=" sh)
+ (string-append "SHELL=" sh)
+ ;; Autoreconf being run by Make, the generated
+ ;; configure script shebangs thus haven't been
+ ;; patched; workaround this by running explicitly
+ ;; via the shell.
+ (string-append "CONFIGURE=" sh " ./configure "
+ "--prefix=" #$output)
+ "VERBOSE=1"))
+ #:phases #~(modify-phases %standard-phases
+ (delete 'configure)
+ (add-before 'build 'adjust-Makefile
+ (lambda _
+ ;; It's best to source a script via its absolute path,
+ ;; otherwise it's looked from PATH and fails for POSIX
+ ;; shells, such as our Bash-provided 'sh' (see:
+ ;; https://github.com/ArcticaProject/nx-libs/issues/1071).
+ (substitute* "Makefile"
+ (("\\. replace.sh")
+ ". ./replace.sh"))))
+ (add-after 'install 'wrap-nxdialog
+ (lambda* (#:key inputs #:allow-other-keys)
+ (wrap-program (string-append #$output "/bin/nxdialog")
+ `("GUIX_PYTHONPATH" =
+ (,(getenv "GUIX_PYTHONPATH")))
+ ;; Ensure GObject Introspection typelibs are found.
+ `("GI_TYPELIB_PATH" ":" =
+ (,(getenv "GI_TYPELIB_PATH")))))))))
+ (native-inputs
+ (list autoconf
+ automake
+ font-util
+ gccmakedep
+ imake
+ libtool
+ perl
+ pkg-config
+ quilt
+ which))
+ (inputs
+ (list gtk+
+ libjpeg-turbo
+ libtirpc
+ libxcomposite
+ libxdamage
+ libxext
+ libxfont
+ libxinerama
+ libxml2
+ libxpm
+ libxrandr
+ libxtst
+ pixman
+ python-pygobject
+ python-wrapper
+ xkbcomp))
+ (propagated-inputs
+ (list libpng)) ;in Requires of nxcomp.pc
+ (synopsis "NX X11 protocol compression libraries")
+ (description "NX is a software suite which implements very efficient
+compression of the X11 protocol. This increases performance when using X
+applications over a network, especially a slow one. This package provides the
+following libraries:
+@table @code
+@item NX_X11
+NX's modified X Window System (X11) library
+@item Xcomp
+NX differential compression library for X11
+@item Xcompshad
+Session shadowing library
+@end table
+
+The following commands are also provided:
+
+@table @command
+@item nxagent
+Agent providing NX transport of X sessions
+@item nxproxy
+The NX proxy (client) binary
+@item nxdialog
+Helper script
+@end table")
(home-page "https://github.com/ArcticaProject/nx-libs")
(license license:gpl2)))