ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-26 12:39:36 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: tigervnc-server: Update to 1.10.1-1.920d9c4.

Browse source 
* gnu/packages/vnc.scm (tigervnc-client): Update to 1.10.1-1.920d9c4.
(tigervnc-server)[version]: Update to 1.10.1-1.920d9c4.
[arguments]<#:phases>[patch-xserver]: Fix format procedure call.
[native-inputs]: Use tigervnc-client package source.
This commit is contained in:
Oleg Pykhalov 2020-05-10 14:07:38 +03:00
parent 705a5dcb87
commit d58c9574b3
No known key found for this signature in database
GPG key ID: 167F8EA5001AFA9C
1 changed files with 45 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
gnu/packages/vnc.scm
View file

@ -43,20 +43,20 @@ (define-module (gnu packages vnc)
#:use-module (gnu packages xorg)) #:use-module (gnu packages xorg))
(define-public tigervnc-client (define-public tigervnc-client
(let ((commit "920d9c4d6562ecabf79497bc901d50522d4bc661"))
(package (package
(name "tigervnc-client") (name "tigervnc-client")
(version "1.10.1") (version (git-version "1.10.1" "1" commit))
(source (source (origin
(origin
(method git-fetch) (method git-fetch)
(uri (uri
(git-reference (git-reference
(url "https://github.com/TigerVNC/tigervnc.git") (url "https://github.com/TigerVNC/tigervnc.git")
(commit (string-append "v" version)))) (commit commit)))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"001n189d2f3psn7nxgl8188ml6f7jbk26cxn2835y3mnlk5lmhgr")))) "1lp6mxl5dqlkrzx0q145jzgpbwvhsni3fj6x9ngf8v5s63x82q1p"))
(file-name (git-file-name name version))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:tests? #f ; Tests that do exists are not automated. '(#:tests? #f ; Tests that do exists are not automated.
@ -88,7 +88,7 @@ (define-public tigervnc-client
applications. It also provides extensions for advanced authentication methods applications. It also provides extensions for advanced authentication methods
and TLS encryption. This package installs only the VNC client, the and TLS encryption. This package installs only the VNC client, the
application which is needed to connect to VNC servers.") application which is needed to connect to VNC servers.")
(license license:gpl2))) (license license:gpl2))))
;; A VNC server is, in fact, an X server so it seems like a good idea ;; 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 ;; to build on the work already done for xorg-server package. This is
@ -103,17 +103,9 @@ (define-public tigervnc-server
(package (package
(inherit xorg-server) (inherit xorg-server)
(name "tigervnc-server") (name "tigervnc-server")
(version "1.10.1") (version (package-version tigervnc-client))
(native-inputs (native-inputs
`(("tigervnc-src" ,(origin `(("tigervnc-src" ,(package-source tigervnc-client))
(method git-fetch)
(uri
(git-reference
(url "https://github.com/TigerVNC/tigervnc.git")
(commit "v1.9.0")))
(sha256
(base32
"0b47fg3741qs3zdpl2zr0s6jz46dypp2j6gqrappbzm3ywnnmm1x"))))
("autoconf" ,autoconf) ("autoconf" ,autoconf)
("automake" ,automake) ("automake" ,automake)
("libtool" ,libtool) ("libtool" ,libtool)
@ -183,9 +175,9 @@ (define-public tigervnc-server
(list-head (string-split xorg-server-version (list-head (string-split xorg-server-version
#\.) #\.)
2))) 2)))
(fn (format "~a/unix/xserver~a.patch" tvnc-src patch-num))) (fn (format #f "~a/unix/xserver~a.patch" tvnc-src patch-num)))
(when (not (file-exists? fn)) (when (not (file-exists? fn))
(error (format "Patch file, ~a, (error (format #f "Patch file, ~a,
corresponding to the input xorg-server version, does not exist. Installation corresponding to the input xorg-server version, does not exist. Installation
will fail. " fn))) will fail. " fn)))