alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

network-manager: 0.9.8.8 -> 0.9.8.10

Browse source
This commit is contained in:
Domen Kožar 2014-11-27 12:09:52 +01:00
parent 91bdca38a0
commit 34ca304f58
3 changed files with 3 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/tools/networking/network-manager-applet/default.nix
View file

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pn}/${major}/${name}.tar.xz"; url = "mirror://gnome/sources/${pn}/${major}/${name}.tar.xz";
sha256 = "1sx97cp9nb5p82kg2dl6dmqri7wichpjqchhx7bk77limngby7jq"; sha256 = "1jz0vawfixzm892m6plrzhsybgdxwv96pfwld9p85lb7wshykzj6";
}; };
buildInputs = [ buildInputs = [

4
pkgs/tools/networking/network-manager/default.nix
View file

@ -5,11 +5,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "network-manager-${version}"; name = "network-manager-${version}";
version = "0.9.8.8"; version = "0.9.8.10";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/NetworkManager/0.9/NetworkManager-${version}.tar.xz"; url = "mirror://gnome/sources/NetworkManager/0.9/NetworkManager-${version}.tar.xz";
sha256 = "0mbsl6x3aavdnam8i87p0zz8fvvgi96g199s35wgg5r8rplks2la"; sha256 = "0wn9qh8r56r8l19dqr68pdl1rv3zg1dv47rfy6fqa91q7li2fk86";
}; };
preConfigure = '' preConfigure = ''

30
pkgs/tools/networking/network-manager/nixos-purity.patch
View file

@ -28,36 +28,6 @@ index 237661f..48bc33f 100644
NULL NULL
}; };
const char **path = dhcpcd_paths; const char **path = dhcpcd_paths;
diff --git a/src/dns-manager/nm-dns-dnsmasq.c b/src/dns-manager/nm-dns-dnsmasq.c
index 8e216f4..6e00210 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@/bin/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..ce718d0 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@/bin/dnsmasq",
NULL
};
diff --git a/src/nm-device.c b/src/nm-device.c diff --git a/src/nm-device.c b/src/nm-device.c
index 1dc94ee..e60f3c8 100644 index 1dc94ee..e60f3c8 100644
--- a/src/nm-device.c --- a/src/nm-device.c