guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: gnu: xl2tpd: Fix build.


From: guix-commits
Subject: branch master updated: gnu: xl2tpd: Fix build.
Date: Mon, 22 Jun 2020 10:49:07 -0400

This is an automated email from the git hooks/post-receive script.

mothacehe pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 0919d61  gnu: xl2tpd: Fix build.
0919d61 is described below

commit 0919d6148faa40914a6cfe574688734dbda8728d
Author: Mathieu Othacehe <othacehe@gnu.org>
AuthorDate: Mon Jun 22 16:46:09 2020 +0200

    gnu: xl2tpd: Fix build.
    
    * gnu/packages/vpn.scm (xl2tpd)[arguments]: Substitute hardcoded pppd path
    instead of trying to set CFLAGS variable.
---
 gnu/packages/vpn.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index 26cb676..e6a2f42 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -648,10 +648,10 @@ public keys and can roam across IP addresses.")
                   (delete 'configure) ;no configure script
                   (add-before 'build 'setup-environment
                     (lambda* (#:key inputs #:allow-other-keys)
-                      (setenv "CFLAGS"
-                              (string-append "-DPPPD=\""
-                                             (assoc-ref inputs "ppp")
-                                             "/sbin/pppd\""))
+                      (substitute* "l2tp.h"
+                        (("/usr/sbin/pppd")
+                         (string-append (assoc-ref inputs "ppp")
+                                        "/sbin/pppd")))
                       (setenv "KERNELSRC"
                               (assoc-ref inputs "linux-libre-headers"))
                       #t)))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]