From patchwork Thu Sep 12 19:33:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "ashish.is--- via Guix-patches\" via" X-Patchwork-Id: 15357 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0FFCD173C1; Thu, 12 Sep 2019 20:35:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,HTML_MESSAGE, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 6493817317 for ; Thu, 12 Sep 2019 20:35:23 +0100 (BST) Received: from localhost ([::1]:37964 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i8UsE-000088-SK for patchwork@mira.cbaines.net; Thu, 12 Sep 2019 15:35:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40913) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i8Urw-00005I-N2 for guix-patches@gnu.org; Thu, 12 Sep 2019 15:35:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i8Uru-0003gO-Ji for guix-patches@gnu.org; Thu, 12 Sep 2019 15:35:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35298) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i8Uru-0003gA-FI for guix-patches@gnu.org; Thu, 12 Sep 2019 15:35:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i8Uru-0004vX-A4 for guix-patches@gnu.org; Thu, 12 Sep 2019 15:35:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#37394] [PATCH] gnu: Add tigervnc Resent-From: Todor =?utf-8?q?Kondi=C4=87?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 12 Sep 2019 19:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 37394 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 37394@debbugs.gnu.org X-Debbugs-Original-To: "guix-patches@gnu.org" Received: via spool by submit@debbugs.gnu.org id=B.156831685018837 (code B ref -1); Thu, 12 Sep 2019 19:35:02 +0000 Received: (at submit) by debbugs.gnu.org; 12 Sep 2019 19:34:10 +0000 Received: from localhost ([127.0.0.1]:44119 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i8Ur3-0004tj-LE for submit@debbugs.gnu.org; Thu, 12 Sep 2019 15:34:10 -0400 Received: from lists.gnu.org ([209.51.188.17]:59584) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i8Ur1-0004tZ-Ps for submit@debbugs.gnu.org; Thu, 12 Sep 2019 15:34:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40722) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i8Uqz-0008Cz-8D for guix-patches@gnu.org; Thu, 12 Sep 2019 15:34:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i8Uqw-0002zL-TP for guix-patches@gnu.org; Thu, 12 Sep 2019 15:34:04 -0400 Received: from mail1.protonmail.ch ([185.70.40.18]:30232) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i8Uqu-0002sp-Du for guix-patches@gnu.org; Thu, 12 Sep 2019 15:34:01 -0400 Date: Thu, 12 Sep 2019 19:33:45 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=default; t=1568316832; bh=0mXOTH+P5gQm+Cq5IUpLJG9kxiFuwygRmR3Ui/oksbk=; h=Date:To:From:Reply-To:Subject:Feedback-ID:From; b=B3YYA5Xs6yPKIS6e5vMxTKjRkb6ve2G49HYxQeWo+X3B5SgOUBiu2DgVIPZ6CCrnm mo55HE7iFZyTZMKrT6JS7lwrOVmr63/dGi85GGPbevyZxzG/MO+lLMEQ5/4HeKRvFw IHVpnQgCTl6WjRD/pcGGeEnfT3+RvD6VTqDOlaTw= Message-ID: Feedback-ID: H-HDHPDhHGpnHYYqEeeELdj-Ly2a7MuykpUWpBFgfQ1BCJpPfO2vKz9YpJUb7-VnGIEXLb5c-uxqytN6PxXV2Q==:Ext:ProtonMail MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: =?unknown-8bit?q?Todor_Kondi=C4=87_via_Guix-patches_=3Cguix-patche?= =?unknown-8bit?q?s=40gnu=2Eorg=3E?= From: =?unknown-8bit?q?Todor_Kondi=C4=87_via_Guix-patches_via_=3Cguix-patche?= =?unknown-8bit?q?s=40gnu=2Eorg=3E?= X-getmail-retrieved-from-mailbox: Patches Hi, I needed a decent VNC server, so I wrapped up TigerVNC into two guix packages. One is for the client, and another for the server. Since the build procedure is non-standard (a combination of cmake for the viewer and some parts, but then patch-and-compile Xorg server for the VNC server) , I could not follow the ([understandably] scarcely documented) package definition procedures in Guix docs and, instead, mixed and matched things I gleaned from other Guix packages. The result works as far as I can tell and was tested in a VM, however, some parts of the package definition could probably be expressed more elegantly. Also, it would be nice if the folks who created xorg-server package definition could check the various configure options in the server part, since the tigervnc-server inherits from xorg-server. For example, was it really necessary to disable Xephyr? I do not even know what is it for. The vncserver script surprisingly works, but could probably customised a bit for the Guix distro. In addition, most distros have a systemd service to start the server. I do not see this as a very important addition, given the Guix orientation towards user managed configs, but if someone wants to help me define one, I am open to it. One nice application for a service would be to implement the multi-user vnc server as described here https://developer.ibm.com/tutorials/os-multiuserloginsvnc/ Finally, the packages were linted, and indented using the script. The lint complains about certain minor things that I feel are better left the way they are. Hopefully someone will find this useful. Cheers, Todor From d379c92550a27c7431065f7acaa8bb1984d1bd7a Mon Sep 17 00:00:00 2001 From: Todor Kondić Date: Thu, 12 Sep 2019 21:00:02 +0200 Subject: [PATCH 2/2] gnu: Add tigervnc-server * gnu/packages/tigervnc.scm (tigervnc-server): New variable. --- gnu/packages/tigervnc.scm | 151 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 151 insertions(+) diff --git a/gnu/packages/tigervnc.scm b/gnu/packages/tigervnc.scm index 71e63cc563..933a1d2dff 100644 --- a/gnu/packages/tigervnc.scm +++ b/gnu/packages/tigervnc.scm @@ -87,3 +87,154 @@ 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. ") )) + + + -- 2.23.0