[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: gnu: WireGuard: Simplify package definitions.
From: |
guix-commits |
Subject: |
01/02: gnu: WireGuard: Simplify package definitions. |
Date: |
Tue, 3 Mar 2020 00:38:26 -0500 (EST) |
lfam pushed a commit to branch master
in repository guix.
commit c1005113a3e8e2d59f63d9e6a0a6176c7f67421f
Author: Leo Famulari <address@hidden>
AuthorDate: Mon Mar 2 23:42:56 2020 -0500
gnu: WireGuard: Simplify package definitions.
* gnu/packages/vpn.scm (wireguard-tools, wireguard)[arguments]: Set
--directory
in #:make-flags and remove the 'chdir', 'enter-source-directory' and
'reset-cwd'
phases.
---
gnu/packages/vpn.scm | 29 ++++++-----------------------
1 file changed, 6 insertions(+), 23 deletions(-)
diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index 78a2c32..a6bba28 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -8,7 +8,7 @@
;;; Copyright © 2017 Julien Lepiller <address@hidden>
;;; Copyright © 2018 Pierre Langlois <address@hidden>
;;; Copyright © 2018 Meiyo Peng <address@hidden>
-;;; Copyright © 2019 Leo Famulari <address@hidden>
+;;; Copyright © 2019, 2020 Leo Famulari <address@hidden>
;;; Copyright © 2019 Rutger Helling <address@hidden>
;;; Copyright © 2019 Ricardo Wurmus <address@hidden>
;;;
@@ -471,6 +471,7 @@ The peer-to-peer VPN implements a Layer 2 (Ethernet)
network between the peers
`(#:tests? #f ; No tests available.
#:make-flags
(list "CC=gcc"
+ "--directory=src/tools"
"WITH_BASHCOMPLETION=yes"
;; Build and install the helper script wg-quick(8).
"WITH_WGQUICK=yes"
@@ -498,17 +499,7 @@ The peer-to-peer VPN implements a Layer 2 (Ethernet)
network between the peers
(call-with-output-file output
(lambda (port)
(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
`(("libmnl" ,libmnl)))
(home-page "https://www.wireguard.com/")
@@ -537,6 +528,7 @@ WireGuard support.")
`(#:tests? #f ; no test suite
#:make-flags
(list "CC=gcc"
+ "--directory=src"
"WITH_BASHCOMPLETION=yes"
;; Install the ‘simple and dirty’ helper script wg-quick(8).
"WITH_WGQUICK=yes"
@@ -545,17 +537,8 @@ WireGuard support.")
(string-append "SYSCONFDIR=no-thanks"))
#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'enter-source-directory
- (lambda _
- (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)))))
+ ;; No configure script
+ (delete 'configure))))
(home-page "https://www.wireguard.com/")
(synopsis "Tools for configuring WireGuard tunnels")
(description