From 0992cfa13aabee70e214057b7343bcb76de77b42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Todor=20Kondi=C4=87?= Date: Thu, 12 Sep 2019 19:33:45 +0000 Subject: gnu: Add tigervnc-client. * gnu/packages/tigervnc.scm: New file. (tigervnc-client): New variable. * gnu/local.mk (GNU_SYSTEM_MODULES): Add tigervnc.scm. Signed-off-by: Danny Milosavljevic --- gnu/packages/tigervnc.scm | 84 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 gnu/packages/tigervnc.scm (limited to 'gnu/packages/tigervnc.scm') diff --git a/gnu/packages/tigervnc.scm b/gnu/packages/tigervnc.scm new file mode 100644 index 0000000000..89aac1c63a --- /dev/null +++ b/gnu/packages/tigervnc.scm @@ -0,0 +1,84 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2019 Todor Kondić +;;; +;;; This file is part of GNU Guix. +;;; +;;; 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 +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages tigervnc) + #:use-module (gnu packages autotools) + #:use-module (gnu packages compression) + #:use-module (gnu packages gettext) + #:use-module (gnu packages tls) + #:use-module (gnu packages linux) + #:use-module (gnu packages xorg) + #:use-module (gnu packages fltk) + #:use-module (gnu packages image) + #:use-module (gnu packages cmake) + #:use-module (gnu packages perl) + #:use-module (gnu packages base) + #:use-module (gnu packages commencement) + #:use-module (guix build-system cmake) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix git-download) + #:use-module (guix utils) + #:use-module ((guix licenses) #:prefix license:)) + +(define-public tigervnc-client + (package + (name "tigervnc-client") + (version "1.9.0") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/TigerVNC/tigervnc.git") + (commit (string-append "v" version)))) + (sha256 + (base32 + "0b47fg3741qs3zdpl2zr0s6jz46dypp2j6gqrappbzm3ywnnmm1x")))) + (build-system cmake-build-system) + (arguments + '(#:tests? #f ; Tests that do exists are not automated. + #:phases (modify-phases %standard-phases + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (with-directory-excursion "vncviewer" + (invoke "make" "install"))))))) + (native-inputs + `(("autoconf" ,autoconf) + ("gettext-minimal" ,gettext-minimal) + ("automake" ,automake))) + (inputs + `(("zlib" ,zlib) + ("gnutls" ,gnutls) + ("libjpeg-turbo" ,libjpeg-turbo) + ("fltk" ,fltk) + ("linux-pam" ,linux-pam) + ("libx11" ,libx11) + ("libxext" ,libxext) + ("libxtst" ,libxtst) + ("libxrandr" ,libxrandr) + ("libxdamage" ,libxdamage))) + (home-page "https://tigervnc.org/") + (synopsis "High-performance, platform-neutral +implementation of VNC (client)") + (description "TigerVNC is a client/server implementation of VNC (Virtual +Network Computing). It provides enough performance to run even 3D and video +applications. It also provides extensions for advanced authentication methods +and TLS encryption. This package installs only the VNC client, the +application which is needed to connect to VNC servers.") + (license license:gpl2))) -- cgit v1.2.3 From 04784d217a279b22434920ec3054fda1d6ac24ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Todor=20Kondi=C4=87?= Date: Wed, 2 Oct 2019 01:20:15 +0200 Subject: gnu: Add tigervnc-server. * gnu/packages/tigervnc.scm (tigervnc-server): New variable. Signed-off-by: Danny Milosavljevic --- gnu/packages/tigervnc.scm | 148 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 148 insertions(+) (limited to 'gnu/packages/tigervnc.scm') diff --git a/gnu/packages/tigervnc.scm b/gnu/packages/tigervnc.scm index 89aac1c63a..695f5bb4f4 100644 --- a/gnu/packages/tigervnc.scm +++ b/gnu/packages/tigervnc.scm @@ -82,3 +82,151 @@ applications. It also provides extensions for advanced authentication methods and TLS encryption. This package installs only the VNC client, the application which is needed to connect to VNC servers.") (license license:gpl2))) + +;; A VNC server is, in fact, an X server so it seems like a good idea +;; to build on the work already done for xorg-server package. This is +;; not entirely compatible with the recommendation in BUILDING.txt +;; where the client is built first, then the source code of the X +;; server is copied into a subdir of the build directory, patched with +;; VNC additions and then build and installed as Xvnc. The procedure +;; was turned around, where TigerVNC code is downloaded and built +;; inside the Guix X server build dir. Also, the VNC patching process +;; for the X server is automated in a straightforward manner. +(define-public tigervnc-server + (package + (inherit xorg-server) + (name "tigervnc-server") + (version "1.9.0") + (native-inputs + `(("tigervnc-src" ,(origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/TigerVNC/tigervnc.git") + (commit "v1.9.0"))) + (sha256 + (base32 + "0b47fg3741qs3zdpl2zr0s6jz46dypp2j6gqrappbzm3ywnnmm1x")))) + ("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("gettext-minimal" ,gettext-minimal) + ("font-util" ,font-util) + ("cmake" ,cmake) + ("gcc-toolchain" ,gcc-toolchain) + ("perl" ,perl) + ,@(package-native-inputs tigervnc-client) + ,@(package-inputs tigervnc-client) + ,@(package-native-inputs xorg-server))) + (inputs + `(("perl" ,perl) + ("coreutils" ,coreutils) + ("xauth" ,xauth) + ,@(package-inputs xorg-server))) + (propagated-inputs + `(("xauth" ,xauth) + ,@(package-propagated-inputs xorg-server))) + (arguments + (substitute-keyword-arguments + (package-arguments xorg-server) + ((#:configure-flags flags) + `(append '("--with-pic" ; Taken from BUILDING.txt + "--without-dtrace" + "--disable-static" + "--disable-dri2" + "--disable-xinerama" + "--disable-xvfb" + "--disable-xnest" + "--disable-xorg" + "--disable-dmx" + "--disable-xwin" + "--disable-xephyr" ; Is this necessary? (*) + "--disable-kdrive" + ;; "--disable-config-dbus" ; This was a warning. + "--disable-config-hal" + "--disable-config-udev" + "--disable-dri2" + ;; "--enable-install-libxf86config" ; This, too, was a warning. + "--enable-glx") + (delete "--enable-xephyr" ,flags))) ; Is this necessary? (*) + ((#:modules modules) + `(append '((ice-9 ftw) + (ice-9 match) + (guix build utils) + (guix build gnu-build-system)) + modules)) + ((#:phases phases) + `(modify-phases ,phases + (delete 'check) ;) + (add-after 'unpack 'copy-tvnc-xserver + (lambda _ + (let* + ((tvnc-src (assoc-ref %build-inputs "tigervnc-src")) + (tvnc-xserver (string-append tvnc-src "/unix/xserver"))) + (copy-recursively tvnc-xserver ".") + #t))) + (add-after 'copy-tvnc-xserver 'patch-xserver + (lambda _ + (let* + ((tvnc-src (assoc-ref %build-inputs "tigervnc-src")) + (xorg-server-version ,(package-version xorg-server)) + (which-patch (lambda () + (let* + ((patch-num (apply string-append + (list-head (string-split xorg-server-version + #\.) + 2))) + (fn (format "~a/unix/xserver~a.patch" tvnc-src patch-num))) + (when (not (file-exists? fn)) + (error (format "Patch file, ~a, +corresponding to the input xorg-server version, does not exist. Installation +will fail. " fn))) + + fn))) ; VNC patches for xserver have the + ; form xserverXY[Y].patch, where + ; X.Y[Y].Z is the Xorg server + ; version. + (xserver-patch (which-patch))) + (invoke "patch" "-p1" "-i" xserver-patch) + (invoke "autoreconf" "-fiv")))) + (add-before 'build 'build-tigervnc + (lambda _ + (let* ((out (assoc-ref %outputs "out")) + (tvnc-src (assoc-ref %build-inputs "tigervnc-src")) + (tvnc-build (string-append (getcwd) "/tigervnc-build"))) + (mkdir-p tvnc-build) + (with-directory-excursion tvnc-build + (invoke "cmake" "-G" "Unix Makefiles" + (string-append "-DCMAKE_INSTALL_PREFIX=" out) + tvnc-src) + (invoke "make" "-j" (number->string (parallel-job-count))))))) + (replace 'build + (lambda _ + (let* ((tvnc-src (assoc-ref %build-inputs "tigervnc-src")) + (tvnc-build (string-append (getcwd) "/tigervnc-build")) + (srcarg (string-append "TIGERVNC_SRCDIR=" tvnc-src)) + (buildarg (string-append "TIGERVNC_BUILDDIR=" tvnc-build))) + (invoke "make" srcarg buildarg "-j" + (number->string (parallel-job-count)))))) + (add-before 'install 'install-tigervnc-aux + (lambda _ + (let* ((out (assoc-ref %outputs 'out)) + (tvnc-src (assoc-ref %build-inputs "tigervnc-src")) + (tvnc-build (string-append (getcwd) "/tigervnc-build")) + (srcarg (string-append "TIGERVNC_SRCDIR=" tvnc-src)) + (buildarg (string-append "TIGERVNC_BUILDDIR=" tvnc-build))) + (with-directory-excursion (string-append tvnc-build "/unix") + (invoke "make" srcarg buildarg "install"))))) + (replace 'install + (lambda* _ + (let* ((tvnc-src (assoc-ref %build-inputs "tigervnc-src")) + (tvnc-build (string-append (getcwd) "/tigervnc-build")) + (srcarg (string-append "TIGERVNC_SRCDIR=" tvnc-src)) + (buildarg (string-append "TIGERVNC_BUILDDIR=" tvnc-build))) + (invoke "make" "install" srcarg buildarg)))))))) + (description "TigerVNC is a client/server implementation of VNC (Virtual +Network Computing). It provides enough performance to run even 3D and video +applications. It also provides extensions for advanced authentication methods +and TLS encryption. This package installs the VNC server, a program that will +enable users with VNC clients to log into a graphical session on the machine +where the server is installed."))) -- cgit v1.2.3 From d8de38563b7a32a96873a8dbc918b6448f3d8665 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Wed, 2 Oct 2019 01:27:23 +0200 Subject: gnu: tigervnc-server: Clean up comments. * gnu/packages/tigervnc.scm (tigervnc-server): Clean up comments. --- gnu/packages/tigervnc.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/tigervnc.scm') diff --git a/gnu/packages/tigervnc.scm b/gnu/packages/tigervnc.scm index 695f5bb4f4..cb44d355c6 100644 --- a/gnu/packages/tigervnc.scm +++ b/gnu/packages/tigervnc.scm @@ -140,7 +140,7 @@ application which is needed to connect to VNC servers.") "--disable-xorg" "--disable-dmx" "--disable-xwin" - "--disable-xephyr" ; Is this necessary? (*) + "--disable-xephyr" "--disable-kdrive" ;; "--disable-config-dbus" ; This was a warning. "--disable-config-hal" @@ -148,7 +148,7 @@ application which is needed to connect to VNC servers.") "--disable-dri2" ;; "--enable-install-libxf86config" ; This, too, was a warning. "--enable-glx") - (delete "--enable-xephyr" ,flags))) ; Is this necessary? (*) + (delete "--enable-xephyr" ,flags))) ((#:modules modules) `(append '((ice-9 ftw) (ice-9 match) -- cgit v1.2.3