From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: 58014@debbugs.gnu.org
Cc: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Subject: [bug#58014] [PATCH 05/15] gnu: tigervnc-server: Patch and wrap vncserver script.
Date: Fri, 23 Sep 2022 01:00:32 -0400 [thread overview]
Message-ID: <20220923050042.29893-5-maxim.cournoyer@gmail.com> (raw)
In-Reply-To: <20220923050042.29893-1-maxim.cournoyer@gmail.com>
* gnu/packages/vnc.scm (tigervnc-server):
[phases]{patch-paths, wrap-vncserver}: New phases.
[inputs]: Add font-alias, guile-3.0, util-linux and xinit.
---
gnu/packages/vnc.scm | 44 ++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 42 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/vnc.scm b/gnu/packages/vnc.scm
index 3731f63846..8bbccfb498 100644
--- a/gnu/packages/vnc.scm
+++ b/gnu/packages/vnc.scm
@@ -289,6 +289,31 @@ (define-public tigervnc-server
(substitute* "tigervnc-client/unix/vncserver/tigervnc.pam"
(("pam_systemd.so")
"pam_elogind.so"))))
+ (add-after 'unpack 'patch-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "tigervnc-client/unix/vncserver/vncserver.in"
+ (("`mcookie`")
+ (format #f "`~a`" (search-input-file inputs "bin/mcookie")))
+ ;; Adjust the places where the vncserver script looks for
+ ;; X11 fonts.
+ (("'/usr/share/X11/fonts'" all)
+ (format #f "'~a', '~a', ~a"
+ "/run/current-system/profile/share/fonts/X11"
+ (string-append #$(this-package-input "font-alias")
+ "share/fonts/X11")
+ all))
+ ;; Adjust the location used to locate of the .desktop files.
+ (("/usr/share/xsessions")
+ "/run/current-system/profile/share/xsessions")
+ ;; Do not require a system-provided Xsession shell script,
+ ;; as Guix System has none. This causes the foreach loop to
+ ;; iterate an empty list (disabled).
+ (("\"/etc/X11/xinit/Xsession\", \"/etc/X11/Xsession\"")
+ "()")
+ (("if \\(not defined \\$Xsession)")
+ "if (0)")
+ (("@cmd, \\$Xsession,")
+ "@cmd,"))))
(add-before 'build 'build-tigervnc
(lambda* (#:key parallel-build? #:allow-other-keys)
(mkdir-p "tigervnc-client/build")
@@ -309,7 +334,16 @@ (define-public tigervnc-server
(invoke "make" "-C" "tigervnc-client/build/unix" "install")))
(replace 'install
(lambda _
- (invoke "make" "install")))))))
+ (invoke "make" "install")))
+ (add-after 'install 'wrap-vncserver
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (wrap-script (search-input-file outputs "libexec/vncserver")
+ (list "PATH" 'prefix
+ (map (lambda (p)
+ (dirname (search-input-file inputs p)))
+ '("bin/uname"
+ "bin/xauth"
+ "bin/xinit"))))))))))
(native-inputs
(modify-inputs (append (package-native-inputs xorg-server)
(package-native-inputs tigervnc-client))
@@ -324,7 +358,13 @@ (define-public tigervnc-server
(inputs
(modify-inputs (append (package-inputs xorg-server)
(package-inputs tigervnc-client))
- (prepend perl coreutils xauth)))
+ (prepend coreutils
+ font-alias
+ guile-3.0
+ perl
+ util-linux
+ xauth
+ xinit)))
(propagated-inputs
(modify-inputs (package-propagated-inputs xorg-server)
(prepend xauth)))
--
2.37.3
next prev parent reply other threads:[~2022-09-23 5:04 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-23 4:58 [bug#58014] [PATCH 00/15] Add xvnc-service-type Maxim Cournoyer
2022-09-23 5:00 ` [bug#58014] [PATCH 01/15] gnu: tigervnc-server: Use new style inputs, gexps Maxim Cournoyer
2022-09-23 5:00 ` [bug#58014] [PATCH 02/15] gnu: tigervnc-server: Move source production into origin snippet Maxim Cournoyer
2022-09-23 5:00 ` [bug#58014] [PATCH 03/15] gnu: tigervnc-server: Adjust PAM config Maxim Cournoyer
2022-09-23 5:00 ` [bug#58014] [PATCH 04/15] gnu: tigervnc-server: Disable tests via #:tests? Maxim Cournoyer
2022-09-23 5:00 ` Maxim Cournoyer [this message]
2022-09-23 5:00 ` [bug#58014] [PATCH 06/15] gnu: gdm: Patch an extra reference to the Xsession script Maxim Cournoyer
2022-09-23 5:00 ` [bug#58014] [PATCH 07/15] services: gdm: Add a configuration field to enable XDMCP Maxim Cournoyer
2022-09-23 5:00 ` [bug#58014] [PATCH 08/15] marionette: Make marionette-screen-text private Maxim Cournoyer
2022-09-23 5:00 ` [bug#58014] [PATCH 09/15] marionette: Preserve screen dumps on failures Maxim Cournoyer
2022-09-23 5:00 ` [bug#58014] [PATCH 10/15] marionette: Define keystrokes for typing colons and exclamation marks Maxim Cournoyer
2022-09-23 5:00 ` [bug#58014] [PATCH 11/15] marionette: Add a callback arguments to wait-for-screen-text Maxim Cournoyer
2022-09-23 5:00 ` [bug#58014] [PATCH 12/15] gnu: dconf: Set sysconfdir to /etc Maxim Cournoyer
2022-09-23 5:00 ` [bug#58014] [PATCH 13/15] services: Add dconf-service-type Maxim Cournoyer
2022-09-23 5:00 ` [bug#58014] [PATCH 14/15] services: xorg: Add auto-suspend? field to <gdm-configuration> Maxim Cournoyer
2022-09-23 5:00 ` [bug#58014] [PATCH 15/15] services: Add xvnc-service-type Maxim Cournoyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220923050042.29893-5-maxim.cournoyer@gmail.com \
--to=maxim.cournoyer@gmail.com \
--cc=58014@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).