Revert "gnu: tigervnc-client: Update to 1.11.0."
This reverts commit 776c700aaf with missing
/gnu/store/...-tigervnc-server-1.11.0/bin/vncserver binary.
			
			
This commit is contained in:
		
							parent
							
								
									fdf7095e85
								
							
						
					
					
						commit
						153151a865
					
				
					 1 changed files with 42 additions and 44 deletions
				
			
		| 
						 | 
					@ -1,9 +1,8 @@
 | 
				
			||||||
;; GNU Guix --- Functional package management for GNU
 | 
					;;; GNU Guix --- Functional package management for GNU
 | 
				
			||||||
;;; Copyright © 2019 Todor Kondić <tk.code@protonmail.com>
 | 
					;;; Copyright © 2019 Todor Kondić <tk.code@protonmail.com>
 | 
				
			||||||
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
 | 
					;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
 | 
				
			||||||
;;; Copyright © 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
 | 
					;;; Copyright © 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
 | 
				
			||||||
;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
 | 
					;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
 | 
				
			||||||
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
 | 
					 | 
				
			||||||
;;;
 | 
					;;;
 | 
				
			||||||
;;; This file is part of GNU Guix.
 | 
					;;; This file is part of GNU Guix.
 | 
				
			||||||
;;;
 | 
					;;;
 | 
				
			||||||
| 
						 | 
					@ -42,56 +41,55 @@
 | 
				
			||||||
  #:use-module (gnu packages pkg-config)
 | 
					  #:use-module (gnu packages pkg-config)
 | 
				
			||||||
  #:use-module (gnu packages sdl)
 | 
					  #:use-module (gnu packages sdl)
 | 
				
			||||||
  #:use-module (gnu packages tls)
 | 
					  #:use-module (gnu packages tls)
 | 
				
			||||||
  #:use-module (gnu packages xdisorg)
 | 
					 | 
				
			||||||
  #:use-module (gnu packages xorg))
 | 
					  #:use-module (gnu packages xorg))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(define-public tigervnc-client
 | 
					(define-public tigervnc-client
 | 
				
			||||||
  (package
 | 
					  (let ((commit "920d9c4d6562ecabf79497bc901d50522d4bc661"))
 | 
				
			||||||
    (name "tigervnc-client")
 | 
					    (package
 | 
				
			||||||
    (version "1.11.0")
 | 
					      (name "tigervnc-client")
 | 
				
			||||||
    (source (origin
 | 
					      (version (git-version "1.10.1" "1" commit))
 | 
				
			||||||
              (method git-fetch)
 | 
					      (source (origin
 | 
				
			||||||
              (uri
 | 
					                (method git-fetch)
 | 
				
			||||||
               (git-reference
 | 
					                (uri
 | 
				
			||||||
                (url "https://github.com/TigerVNC/tigervnc")
 | 
					                 (git-reference
 | 
				
			||||||
                (commit (string-append "v" version))))
 | 
					                  (url "https://github.com/TigerVNC/tigervnc")
 | 
				
			||||||
              (sha256
 | 
					                  (commit commit)))
 | 
				
			||||||
               (base32
 | 
					                (sha256
 | 
				
			||||||
                "1bg79ahr4mzy48ak0caxy3ckdsxmhpchypggaz6lxjjk92hgsz91"))
 | 
					                 (base32
 | 
				
			||||||
              (file-name (git-file-name name version))))
 | 
					                  "1lp6mxl5dqlkrzx0q145jzgpbwvhsni3fj6x9ngf8v5s63x82q1p"))
 | 
				
			||||||
    (build-system cmake-build-system)
 | 
					                (file-name (git-file-name name version))))
 | 
				
			||||||
    (arguments
 | 
					      (build-system cmake-build-system)
 | 
				
			||||||
     '(#:tests? #f ; Tests that do exists are not automated.
 | 
					      (arguments
 | 
				
			||||||
       #:phases (modify-phases %standard-phases
 | 
					       '(#:tests? #f ; Tests that do exists are not automated.
 | 
				
			||||||
                  (replace 'install
 | 
					         #:phases (modify-phases %standard-phases
 | 
				
			||||||
                    (lambda* (#:key outputs #:allow-other-keys)
 | 
					                    (replace 'install
 | 
				
			||||||
                      (with-directory-excursion "vncviewer"
 | 
					                      (lambda* (#:key outputs #:allow-other-keys)
 | 
				
			||||||
                        (invoke "make" "install")))))))
 | 
					                        (with-directory-excursion "vncviewer"
 | 
				
			||||||
    (native-inputs
 | 
					                          (invoke "make" "install")))))))
 | 
				
			||||||
     `(("autoconf" ,autoconf)
 | 
					      (native-inputs
 | 
				
			||||||
       ("gettext-minimal" ,gettext-minimal)
 | 
					       `(("autoconf" ,autoconf)
 | 
				
			||||||
       ("automake" ,automake)))
 | 
					         ("gettext-minimal" ,gettext-minimal)
 | 
				
			||||||
    (inputs
 | 
					         ("automake" ,automake)))
 | 
				
			||||||
     `(("zlib" ,zlib)
 | 
					      (inputs
 | 
				
			||||||
       ("gnutls" ,gnutls)
 | 
					       `(("zlib" ,zlib)
 | 
				
			||||||
       ("libjpeg-turbo" ,libjpeg-turbo)
 | 
					         ("gnutls" ,gnutls)
 | 
				
			||||||
       ("fltk" ,fltk)
 | 
					         ("libjpeg-turbo" ,libjpeg-turbo)
 | 
				
			||||||
       ("linux-pam" ,linux-pam)
 | 
					         ("fltk" ,fltk)
 | 
				
			||||||
       ("libx11" ,libx11)
 | 
					         ("linux-pam" ,linux-pam)
 | 
				
			||||||
       ("libxext" ,libxext)
 | 
					         ("libx11" ,libx11)
 | 
				
			||||||
       ("libxtst" ,libxtst)
 | 
					         ("libxext" ,libxext)
 | 
				
			||||||
       ("libxrandr" ,libxrandr)
 | 
					         ("libxtst" ,libxtst)
 | 
				
			||||||
       ("libxdamage" ,libxdamage)
 | 
					         ("libxrandr" ,libxrandr)
 | 
				
			||||||
       ("pixman" ,pixman)))
 | 
					         ("libxdamage" ,libxdamage)))
 | 
				
			||||||
    (home-page "https://tigervnc.org/")
 | 
					      (home-page "https://tigervnc.org/")
 | 
				
			||||||
    (synopsis "High-performance, platform-neutral
 | 
					      (synopsis "High-performance, platform-neutral
 | 
				
			||||||
implementation of VNC (client)")
 | 
					implementation of VNC (client)")
 | 
				
			||||||
    (description "TigerVNC is a client/server implementation of VNC (Virtual
 | 
					      (description "TigerVNC is a client/server implementation of VNC (Virtual
 | 
				
			||||||
Network Computing).  It provides enough performance to run even 3D and video
 | 
					Network Computing).  It provides enough performance to run even 3D and video
 | 
				
			||||||
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
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Reference in a new issue