diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-10-18 18:10:47 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-10-18 18:10:47 +0200 |
| commit | b95d1b3289a6bb8e346a47e750660e16fb201c57 (patch) | |
| tree | cd4d956436f21d77645fd795d3e9737e4892c1d3 /gnu/packages/connman.scm | |
| parent | a1d1703a1dc6bfcd10f48fe707ee7ac65300a37d (diff) | |
| parent | dabcfc6de29032ea52d1cb54163a783f7e480167 (diff) | |
| download | patches-b95d1b3289a6bb8e346a47e750660e16fb201c57.tar patches-b95d1b3289a6bb8e346a47e750660e16fb201c57.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/connman.scm')
| -rw-r--r-- | gnu/packages/connman.scm | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/gnu/packages/connman.scm b/gnu/packages/connman.scm index df5aa7bb6d..1185561bc4 100644 --- a/gnu/packages/connman.scm +++ b/gnu/packages/connman.scm @@ -56,11 +56,10 @@ (arguments `(#:configure-flags (list "--enable-nmcompat" - "--enable-polkit" + "--enable-polkit" ; Polkit doesn't need to be present at build time. "--enable-openconnect" "--enable-openvpn" "--enable-vpnc" - "--enable-pptp" "--enable-l2tp" "--localstatedir=/var" (string-append @@ -69,13 +68,12 @@ "--with-dbusdatadir=" (assoc-ref %outputs "out") "/share")))) (native-inputs `(("pkg-config" ,pkg-config) - ("python" ,python-2))) + ("python" ,python-wrapper))) (inputs `(("dbus" ,dbus) ("glib" ,glib) ("gnutls" ,gnutls) ("iptables" ,iptables) - ("polkit" ,polkit) ;so connman can be used by unprivileged users ("readline" ,readline) ;; These inputs are needed for connman to include the interface to ;; these technologies so IF they are installed they can be used. @@ -84,7 +82,8 @@ ("openvpn" ,openvpn) ("ppp" ,ppp) ("vpnc" ,vpnc) - ("wpa-supplicant" ,wpa-supplicant))) + ("wpa-supplicant" ,wpa-supplicant) + ("xl2tpd" ,xl2tpd))) (home-page "https://01.org/connman") (synopsis "Connection management daemon") (description "Connman provides a daemon for managing Internet connections. @@ -126,9 +125,9 @@ sharing) to clients via USB, ethernet, WiFi, cellular and Bluetooth.") (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("efl" ,efl) - ("python-2" ,python-2) - ("python2-dbus" ,python2-dbus) - ("python2-efl" ,python2-efl))) + ("python" ,python-wrapper) + ("python-dbus" ,python-dbus) + ("python-efl" ,python-efl))) (home-page "https://www.enlightenment.org") (synopsis "Connman User Interface written using the EFL") (description |