diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-10 23:13:32 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-10 23:13:32 +0000 |
| commit | 1fef26d8f7907acd40ff631f158223bc3769db06 (patch) | |
| tree | 86fb6ddd6f4a8ecc05b8cc4c4935e77d2bcd79b7 /pkgs/tools/networking/network-manager | |
| parent | 251b9b6472e396b2a7d6a33d7920b3fba13eb5fa (diff) | |
| download | nixlib-1fef26d8f7907acd40ff631f158223bc3769db06.tar nixlib-1fef26d8f7907acd40ff631f158223bc3769db06.tar.gz nixlib-1fef26d8f7907acd40ff631f158223bc3769db06.tar.bz2 nixlib-1fef26d8f7907acd40ff631f158223bc3769db06.tar.lz nixlib-1fef26d8f7907acd40ff631f158223bc3769db06.tar.xz nixlib-1fef26d8f7907acd40ff631f158223bc3769db06.tar.zst nixlib-1fef26d8f7907acd40ff631f158223bc3769db06.zip | |
NM purity patch: substitute before build, fix typos
svn path=/nixpkgs/trunk/; revision=32978
Diffstat (limited to 'pkgs/tools/networking/network-manager')
| -rw-r--r-- | pkgs/tools/networking/network-manager/default.nix | 23 | ||||
| -rw-r--r-- | pkgs/tools/networking/network-manager/nixos-purity.patch | 6 |
2 files changed, 11 insertions, 18 deletions
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 49aacaa4ef9a..98d933ca2518 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, intltool, wirelesstools, pkgconfig, dbus_glib, xz , udev, libnl1, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables -, libgcrypt, dnsmasq, avahi }: +, libgcrypt, dnsmasq, avahi, substituteAll }: stdenv.mkDerivation rec { name = "network-manager-${version}"; @@ -33,26 +33,19 @@ stdenv.mkDerivation rec { buildNativeInputs = [ intltool pkgconfig ]; - patches = [ ./nixos-purity.patch ]; + patches = + [ ( substituteAll { + src = ./nixos-purity.patch; + inherit avahi dnsmasq ppp; + glibc = stdenv.gcc.libc; + }) + ]; preInstall = '' installFlagsArray=( "sysconfdir=$out/etc" "localstatedir=$out/var" ) ''; - inherit avahi dnsmasq ppp; - glibc = stdenv.gcc.libc; - - # 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/; description = "Network configuration and management in an easy way. Desktop environment independent."; diff --git a/pkgs/tools/networking/network-manager/nixos-purity.patch b/pkgs/tools/networking/network-manager/nixos-purity.patch index 93e651ea096e..41f7d3b73516 100644 --- a/pkgs/tools/networking/network-manager/nixos-purity.patch +++ b/pkgs/tools/networking/network-manager/nixos-purity.patch @@ -55,7 +55,7 @@ index 2767208..6562015 100644 - "/usr/local/sbin/dnsmasq", - "/usr/sbin/dnsmasq", - "/sbin/dnsmasq", -+ "@dnsmasq@/sbin/dnsmasq", ++ "@dnsmasq@/bin/dnsmasq", NULL }; const char **binary = paths; @@ -70,7 +70,7 @@ index ca2f9dc..7afb118 100644 - "/usr/local/sbin/dnsmasq", - "/usr/sbin/dnsmasq", - "/sbin/dnsmasq", -+ "@dnsmasq@/sbin/dnsmasq", ++ "@dnsmasq@/bin/dnsmasq", NULL }; @@ -84,7 +84,7 @@ index 3522ea4..75b2db3 100644 static const char *aipd_paths[] = { - "/usr/sbin/avahi-autoipd", - "/usr/local/sbin/avahi-autoipd", -+ "@avahi@/sbin/autoipd", ++ "@avahi@/sbin/avahi-autoipd", NULL }; int i = 0; |