public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

networkmanager: Build with ModemManager support

Browse Source
This commit is contained in:
Rickard Nilsson 2014-02-13 18:03:06 +01:00
parent 129d1b9851
commit 0d506296f0
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/tools/networking/network-manager/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, intltool, wirelesstools, pkgconfig, dbus_glib, xz { stdenv, fetchurl, intltool, wirelesstools, pkgconfig, dbus_glib, xz
, udev, libnl, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables , udev, libnl, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables
, libgcrypt, dnsmasq, avahi, bind, perl, bluez5, substituteAll , libgcrypt, dnsmasq, avahi, bind, perl, bluez5, substituteAll
, gobjectIntrospection }: , gobjectIntrospection, modemmanager }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "network-manager-${version}"; name = "network-manager-${version}";
@ -33,9 +33,11 @@ stdenv.mkDerivation rec {
"--with-crypto=gnutls" "--disable-more-warnings" "--with-crypto=gnutls" "--disable-more-warnings"
"--with-systemdsystemunitdir=$(out)/etc/systemd/system" "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
"--with-kernel-firmware-dir=/run/current-system/firmware" "--with-kernel-firmware-dir=/run/current-system/firmware"
"--with-session-tracking=systemd" ]; "--with-session-tracking=systemd"
"--with-modem-manager-1"
];
buildInputs = [ wirelesstools udev libnl libuuid polkit ppp xz bluez5 gobjectIntrospection ]; buildInputs = [ wirelesstools udev libnl libuuid polkit ppp xz bluez5 gobjectIntrospection modemmanager ];
propagatedBuildInputs = [ dbus_glib gnutls libgcrypt ]; propagatedBuildInputs = [ dbus_glib gnutls libgcrypt ];

6
pkgs/tools/networking/network-manager/pptp-purity.patch
View File

@ -2,7 +2,7 @@ diff --git a/src/nm-pptp-service.c b/src/nm-pptp-service.c
index 68a5759..568bbfe 100644 index 68a5759..568bbfe 100644
--- a/src/nm-pptp-service.c --- a/src/nm-pptp-service.c
+++ b/src/nm-pptp-service.c +++ b/src/nm-pptp-service.c
@@ -729,9 +729,7 @@ nm_find_pppd (void) @@ -730,9 +730,7 @@ nm_find_pppd (void)
{ {
static const char *pppd_binary_paths[] = static const char *pppd_binary_paths[] =
{ {
@ -12,8 +12,8 @@ index 68a5759..568bbfe 100644
+ "@ppp@/sbin/pppd", + "@ppp@/sbin/pppd",
NULL NULL
}; };
@@ -751,9 +749,7 @@ nm_find_pptp (void) @@ -752,9 +750,7 @@ nm_find_pptp (void)
{ {
static const char *pptp_binary_paths[] = static const char *pptp_binary_paths[] =
{ {