diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-02-20 17:01:39 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-02-20 17:01:39 +0100 |
| commit | 2c76e19df4b0b4aa0171f1edd9f240f7b6ba5b84 (patch) | |
| tree | c2e7a7f27dd9c7e704f2e78655328c903a6934d1 /gnu/packages/rdesktop.scm | |
| parent | e6a668ec7303a71f87e4c9354b1458e555058c63 (diff) | |
| parent | 78b2eb1ad3dcf05c25e0ee4980c97aa52de03a2d (diff) | |
| download | patches-2c76e19df4b0b4aa0171f1edd9f240f7b6ba5b84.tar patches-2c76e19df4b0b4aa0171f1edd9f240f7b6ba5b84.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/rdesktop.scm')
| -rw-r--r-- | gnu/packages/rdesktop.scm | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/gnu/packages/rdesktop.scm b/gnu/packages/rdesktop.scm index 777606d77f..2febb1b5f4 100644 --- a/gnu/packages/rdesktop.scm +++ b/gnu/packages/rdesktop.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2019 Leo Famulari <leo@famulari.name> ;;; ;;; This file is part of GNU Guix. ;;; @@ -45,18 +46,18 @@ (define-public rdesktop (package (name "rdesktop") - (version "1.8.3") + (version "1.8.4") (source (origin (method url-fetch) - (uri (string-append - "mirror://sourceforge/rdesktop/rdesktop/" version "/" - "rdesktop-" version ".tar.gz")) + (uri (string-append "https://github.com/rdesktop/rdesktop/" + "releases/download/v" version "/rdesktop-" + version ".tar.gz")) (sha256 (base32 - "1r7c1rjmw2xzq8fw0scyb453gy9z19774z1z8ldmzzsfndb03cl8")))) + "0bfd9nl2dfr1931fv6bpnrj5yf88ikijrs4s3nm96gm87bkvi64v")))) (build-system gnu-build-system) (arguments - '(#:configure-flags (list (string-append "--with-openssl=" + `(#:configure-flags (list (string-append "--with-openssl=" (assoc-ref %build-inputs "openssl")) @@ -64,11 +65,22 @@ "--disable-credssp" "--disable-smartcard") + #:phases + (modify-phases %standard-phases + (add-after 'install-license-files 'delete-extraneous-files + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (license-dir (string-append out "/share/doc/" + ,name "-" ,version))) + ;; XXX These files are installed erroneously. + (delete-file (string-append license-dir "/licence.c")) + (delete-file (string-append license-dir "/licence.o"))) + #t))) #:tests? #f)) ;no 'check' target (inputs `(("libx11" ,libx11) ("openssl" ,openssl))) - (home-page "http://www.rdesktop.org/") + (home-page "https://www.rdesktop.org/") (synopsis "Client for Windows Terminal Services") (description "rdesktop is a client for Microsoft's Windows Remote Desktop Services, |