diff options
| author | Chloe Brown <chloe.brown.00@outlook.com> | 2024-09-09 16:46:20 +0100 |
|---|---|---|
| committer | Chloe Brown <chloe.brown.00@outlook.com> | 2024-09-09 16:46:20 +0100 |
| commit | ed8ba9a77ea1891c5a729e7bbfa3058bf0ba8e6e (patch) | |
| tree | dddb5c51210690e77207df846f15bb10bdd3268d | |
| parent | 774cc075408062d66976a270e74633deaf4ab657 (diff) | |
network-manager-l2tp: fix more hardcoded paths.
| -rw-r--r-- | yellowsquid/packages/network.scm | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/yellowsquid/packages/network.scm b/yellowsquid/packages/network.scm index f377c31..cf64bd0 100644 --- a/yellowsquid/packages/network.scm +++ b/yellowsquid/packages/network.scm @@ -45,12 +45,21 @@ #~(modify-phases %standard-phases (add-after 'configure 'patch-path (lambda* (#:key inputs #:allow-other-keys #:rest args) - (let* ((modprobe (search-input-file inputs "/bin/modprobe"))) + (let* ((ipsec (search-input-file inputs "/sbin/ipsec")) + (xl2tpd (search-input-file inputs "/sbin/xl2tpd")) + (modprobe (search-input-file inputs "/bin/modprobe")) + (pretty-xl2tpd (string-append "\"" xl2tpd "\"")) + (pretty-ipsec (string-append "\"" ipsec "\""))) (for-each (lambda (file) (substitute* file + (("\"(/usr(/local)?)?/s?bin/xl2tpd\"") pretty-xl2tpd) + (("\"(/usr(/local)?)?/s?bin/kl2tpd\"") "NULL") + (("\"(/usr(/local)?)?/s?bin/ipsec\"") pretty-ipsec) + (("\"(/usr(/local)?)?/s?bin/strongswan\"") "NULL") (("/sbin/modprobe") modprobe))) - '("src/nm-l2tp-service.c")))))))) + '("src/nm-l2tp-service.c" + "shared/utils.c")))))))) (native-inputs (list autoconf automake |