Author: urkud
Date: Sat Sep 10 19:23:26 2011
New Revision: 29160
URL: https://ssl.nixos.org/websvn/nix/?rev=29160&sc=1
Log:
Trying to fix networkmanager
Added:
nixpkgs/trunk/pkgs/tools/networking/network-manager/nixos-purity.patch
Modified:
nixpkgs/trunk/pkgs/tools/networking/network-manager/default.nix
Modified: nixpkgs/trunk/pkgs/tools/networking/network-manager/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/tools/networking/network-manager/default.nix Sat Sep
10 18:31:43 2011 (r29159)
+++ nixpkgs/trunk/pkgs/tools/networking/network-manager/default.nix Sat Sep
10 19:23:26 2011 (r29160)
@@ -1,22 +1,54 @@
{ stdenv, fetchurl, intltool, wirelesstools, pkgconfig, dbus, dbus_glib
-, udev, libnl1, libuuid, polkit, gnutls, ppp, dhcp, iptables, libtasn1
-, libgcrypt }:
-stdenv.mkDerivation rec {
+, udev, libnl1, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables, libtasn1
+, libgcrypt, dnsmasq, avahi }:
+stdenv.mkDerivation rec {
name = "network-manager-${version}";
- version = "0.8.1";
+ version = "0.9.0";
src = fetchurl {
- url =
"mirror://gnome/sources/NetworkManager/0.8/NetworkManager-${version}.tar.bz2";
- sha256 = "1yhr1zc9p2dakvg6m33jgkf09r6f6bzly7kqqjcpim4r66z6y4nw";
+ url =
"mirror://gnome/sources/NetworkManager/0.9/NetworkManager-${version}.tar.bz2";
+ sha256 = "0kvi767c224zlja65r8gixmhj57292k0gsxa0217lw5i99l2incq";
};
- configureFlags = [ "--with-distro=gentoo" "--with-dhclient=${dhcp}/sbin"
- "--with-dhcpcd=${dhcp}/sbin" "--with-iptables=${iptables}/sbin/iptables"
- "--with-crypto=gnutls" "--disable-more-warnings"
- "--with-udev-dir=\${out}/lib/udev" ];
+ # Right now we hardcode quite a few paths at build time. Probably we should
+ # patch networkmanager to allow passing these path in config file. This will
+ # remove unneeded build-time dependencies.
+ configureFlags = [
+ "--with-distro=exherbo"
+ "--with-dhclient=${dhcp}/sbin/dhclient"
+ # Upstream prefers dhclient, so don't add dhcpcd to the closure
+ #"--with-dhcpcd=${dhcpcd}/sbin/dhcpcd"
+ "--with-dhcpcd=no"
+ "--with-iptables=${iptables}/sbin/iptables"
+ "--with-udev-dir=\${out}/lib/udev"
+ "--without-resolvconf"
+ "--sysconfdir=/etc" "--localstatedir=/var"
+ "--with-dbus-sys-dir=\${out}/etc/dbus-1/system.d"
+ "--with-crypto=gnutls" "--disable-more-warnings" ];
+
+ buildInputs = [ intltool wirelesstools pkgconfig dbus dbus_glib udev libnl1
+ libuuid polkit gnutls ppp libtasn1 libgcrypt ];
+
+ patches = [ ./nixos-purity.patch ];
+
+ preInstall =
+ ''
+ installFlagsArray=( "sysconfdir=$out/etc" "localstatedir=$out/var" )
+ '';
+
+ inherit avahi dnsmasq ppp;
+ glibc = stdenv.gcc.libc;
- buildInputs = [ intltool wirelesstools pkgconfig dbus dbus_glib udev libnl1
libuuid polkit gnutls ppp libtasn1 libgcrypt ];
+ # Substitute full paths, check if there any not substituted path
+ postPatch =
+ ''
+ for i in src/backends/NetworkManagerExherbo.c
src/dns-manager/nm-dns-dnsmasq.c \
+ src/dnsmasq-manager/nm-dnsmasq-manager.c src/nm-device.c
src/ppp-manager/nm-ppp-manager.c; do
+ substituteAll "$i" "$i"
+ done
+ find . -name \*.c | xargs grep '@[a-zA-Z]*@' && exit 1 || true
+ '';
meta = with stdenv.lib; {
homepage = http://projects.gnome.org/NetworkManager/;
Added: nixpkgs/trunk/pkgs/tools/networking/network-manager/nixos-purity.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/tools/networking/network-manager/nixos-purity.patch
Sat Sep 10 19:23:26 2011 (r29160)
@@ -0,0 +1,123 @@
+diff --git a/src/backends/NetworkManagerExherbo.c
b/src/backends/NetworkManagerExherbo.c
+index d7e24cf..aa64210 100644
+--- a/src/backends/NetworkManagerExherbo.c
++++ b/src/backends/NetworkManagerExherbo.c
+@@ -56,9 +56,9 @@ void nm_system_enable_loopback (void)
+ */
+ void nm_system_update_dns (void)
+ {
+- if (g_file_test ("/usr/sbin/nscd", G_FILE_TEST_IS_EXECUTABLE)) {
++ if (g_file_test ("@glibc@/sbin/nscd", G_FILE_TEST_IS_EXECUTABLE)) {
+ nm_log_info (LOGD_DNS, "Clearing nscd hosts cache.");
+- nm_spawn_process ("/usr/sbin/nscd -i hosts");
++ nm_spawn_process ("@glibc@/sbin/nscd -i hosts");
+ }
+ }
+
+diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c
b/src/dhcp-manager/nm-dhcp-dhclient.c
+index 88136a9..b4113a9 100644
+--- a/src/dhcp-manager/nm-dhcp-dhclient.c
++++ b/src/dhcp-manager/nm-dhcp-dhclient.c
+@@ -68,10 +68,6 @@ const char *
+ nm_dhcp_dhclient_get_path (const char *try_first)
+ {
+ static const char *dhclient_paths[] = {
+- "/sbin/dhclient",
+- "/usr/sbin/dhclient",
+- "/usr/pkg/sbin/dhclient",
+- "/usr/local/sbin/dhclient",
+ NULL
+ };
+ const char **path = dhclient_paths;
+diff --git a/src/dhcp-manager/nm-dhcp-dhcpcd.c
b/src/dhcp-manager/nm-dhcp-dhcpcd.c
+index 237661f..48bc33f 100644
+--- a/src/dhcp-manager/nm-dhcp-dhcpcd.c
++++ b/src/dhcp-manager/nm-dhcp-dhcpcd.c
+@@ -51,10 +51,6 @@ const char *
+ nm_dhcp_dhcpcd_get_path (const char *try_first)
+ {
+ static const char *dhcpcd_paths[] = {
+- "/sbin/dhcpcd",
+- "/usr/sbin/dhcpcd",
+- "/usr/pkg/sbin/dhcpcd",
+- "/usr/local/sbin/dhcpcd",
+ NULL
+ };
+ const char **path = dhcpcd_paths;
+diff --git a/src/dns-manager/nm-dns-dnsmasq.c
b/src/dns-manager/nm-dns-dnsmasq.c
+index 2767208..6562015 100644
+--- a/src/dns-manager/nm-dns-dnsmasq.c
++++ b/src/dns-manager/nm-dns-dnsmasq.c
+@@ -52,9 +52,7 @@ static inline const char *
+ find_dnsmasq (void)
+ {
+ static const char *paths[] = {
+- "/usr/local/sbin/dnsmasq",
+- "/usr/sbin/dnsmasq",
+- "/sbin/dnsmasq",
++ "@dnsmasq@/sbin/dnsmasq",
+ NULL
+ };
+ const char **binary = paths;
+diff --git a/src/dnsmasq-manager/nm-dnsmasq-manager.c
b/src/dnsmasq-manager/nm-dnsmasq-manager.c
+index ca2f9dc..7afb118 100644
+--- a/src/dnsmasq-manager/nm-dnsmasq-manager.c
++++ b/src/dnsmasq-manager/nm-dnsmasq-manager.c
+@@ -170,9 +170,7 @@ static inline const char *
+ nm_find_dnsmasq (void)
+ {
+ static const char *dnsmasq_binary_paths[] = {
+- "/usr/local/sbin/dnsmasq",
+- "/usr/sbin/dnsmasq",
+- "/sbin/dnsmasq",
++ "@dnsmasq@/sbin/dnsmasq",
+ NULL
+ };
+
+diff --git a/src/nm-device.c b/src/nm-device.c
+index 3522ea4..75b2db3 100644
+--- a/src/nm-device.c
++++ b/src/nm-device.c
+@@ -1285,8 +1285,7 @@ aipd_exec (NMDevice *self, GError **error)
+ gboolean success = FALSE;
+ const char **aipd_binary = NULL;
+ static const char *aipd_paths[] = {
+- "/usr/sbin/avahi-autoipd",
+- "/usr/local/sbin/avahi-autoipd",
++ "@avahi@/sbin/autoipd",
+ NULL
+ };
+ int i = 0;
+@@ -2446,7 +2445,7 @@ share_init (void)
+ }
+
+ for (iter = modules; *iter; iter++) {
+- char *argv[3] = { "/sbin/modprobe", *iter, NULL };
++ char *argv[3] = { "/var/run/current-system/sw/sbin/modprobe",
*iter, NULL };
+ char *envp[1] = { NULL };
+ GError *error = NULL;
+
+diff --git a/src/ppp-manager/nm-ppp-manager.c
b/src/ppp-manager/nm-ppp-manager.c
+index e863aab..27c14e2 100644
+--- a/src/ppp-manager/nm-ppp-manager.c
++++ b/src/ppp-manager/nm-ppp-manager.c
+@@ -661,9 +661,7 @@ static inline const char *
+ nm_find_pppd (void)
+ {
+ static const char *pppd_binary_paths[] = {
+- "/usr/local/sbin/pppd",
+- "/usr/sbin/pppd",
+- "/sbin/pppd",
++ "@ppp@/sbin/pppd",
+ NULL
+ };
+
+@@ -992,7 +990,7 @@ nm_ppp_manager_start (NMPPPManager *manager,
+
+ /* Make sure /dev/ppp exists (bgo #533064) */
+ if (stat ("/dev/ppp", &st) || !S_ISCHR (st.st_mode))
+- ignored = system ("/sbin/modprobe ppp_generic");
++ ignored = system ("/var/run/current-system/sw/sbin/modprobe
ppp_generic");
+
+ connection = nm_act_request_get_connection (req);
+ g_assert (connection);
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
