ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-13 14:40:21 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: WireGuard: Simplify package definitions.

Browse source 
* gnu/packages/vpn.scm (wireguard-tools, wireguard)[arguments]: Set --directory
in #:make-flags and remove the 'chdir', 'enter-source-directory' and 'reset-cwd'
phases.
This commit is contained in:
Leo Famulari 2020-03-02 23:42:56 -05:00
parent 85a7466e22
commit c1005113a3
No known key found for this signature in database
GPG key ID: 2646FA30BACA7F08
1 changed files with 6 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
gnu/packages/vpn.scm
View file

@ -8,7 +8,7 @@
;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2018 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2018 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2018 Meiyo Peng <meiyo.peng@gmail.com> ;;; Copyright © 2018 Meiyo Peng <meiyo.peng@gmail.com>
;;; Copyright © 2019 Leo Famulari <leo@famulari.name> ;;; Copyright © 2019, 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2019 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
;;; ;;;
@ -471,6 +471,7 @@ (define-public wireguard
`(#:tests? #f ; No tests available. `(#:tests? #f ; No tests available.
#:make-flags #:make-flags
(list "CC=gcc" (list "CC=gcc"
"--directory=src/tools"
"WITH_BASHCOMPLETION=yes" "WITH_BASHCOMPLETION=yes"
;; Build and install the helper script wg-quick(8). ;; Build and install the helper script wg-quick(8).
"WITH_WGQUICK=yes" "WITH_WGQUICK=yes"
@ -498,16 +499,6 @@ (define-public wireguard
(call-with-output-file output (call-with-output-file output
(lambda (port) (lambda (port)
(format port "~a" str)))) (format port "~a" str))))
#t))
(add-after 'make-patch 'chdir
(lambda _
(chdir "src/tools")
#t))
;; Otherwise the 'install-license-file' phase installs nothing.
;; <https://bugs.gnu.org/34703>
(add-after 'install 'reset-cwd
(lambda _
(chdir "../..")
#t))))) #t)))))
(inputs (inputs
`(("libmnl" ,libmnl))) `(("libmnl" ,libmnl)))
@ -537,6 +528,7 @@ (define-public wireguard-tools
`(#:tests? #f ; no test suite `(#:tests? #f ; no test suite
#:make-flags #:make-flags
(list "CC=gcc" (list "CC=gcc"
"--directory=src"
"WITH_BASHCOMPLETION=yes" "WITH_BASHCOMPLETION=yes"
;; Install the ‘simple and dirty’ helper script wg-quick(8). ;; Install the ‘simple and dirty’ helper script wg-quick(8).
"WITH_WGQUICK=yes" "WITH_WGQUICK=yes"
@ -545,17 +537,8 @@ (define-public wireguard-tools
(string-append "SYSCONFDIR=no-thanks")) (string-append "SYSCONFDIR=no-thanks"))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'enter-source-directory ;; No configure script
(lambda _ (delete 'configure))))
(chdir "src")
#t))
(delete 'configure) ; no configure script
(add-after 'install 'reset-cwd
;; Otherwise the 'install-license-file' phase installs nothing.
;; <https://bugs.gnu.org/34703>
(lambda _
(chdir "..")
#t)))))
(home-page "https://www.wireguard.com/") (home-page "https://www.wireguard.com/")
(synopsis "Tools for configuring WireGuard tunnels") (synopsis "Tools for configuring WireGuard tunnels")
(description (description