diff options
| author | Cillian de Róiste <goibhniu@fsfe.org> | 2013-02-18 21:46:15 +0100 |
|---|---|---|
| committer | Cillian de Róiste <goibhniu@fsfe.org> | 2013-02-18 21:46:15 +0100 |
| commit | f81dbf4893a889ba6e6885b461ed47635e4aab7d (patch) | |
| tree | e21baf5ef7ba47eb6c761bfa965090335e146341 /pkgs/tools/networking/wicd | |
| parent | fbe4e1af93247bbe37222c4728d390db943ef747 (diff) | |
| download | nixlib-f81dbf4893a889ba6e6885b461ed47635e4aab7d.tar nixlib-f81dbf4893a889ba6e6885b461ed47635e4aab7d.tar.gz nixlib-f81dbf4893a889ba6e6885b461ed47635e4aab7d.tar.bz2 nixlib-f81dbf4893a889ba6e6885b461ed47635e4aab7d.tar.lz nixlib-f81dbf4893a889ba6e6885b461ed47635e4aab7d.tar.xz nixlib-f81dbf4893a889ba6e6885b461ed47635e4aab7d.tar.zst nixlib-f81dbf4893a889ba6e6885b461ed47635e4aab7d.zip | |
wicd: NixOS/nixos#88 add resolvconf to PATH for wicd
with this patch resolvconf is used to set the DNS via wicd, although this doesn't seem to stop dhcpcd from clobbering /etc/resolv.conf
Diffstat (limited to 'pkgs/tools/networking/wicd')
| -rw-r--r-- | pkgs/tools/networking/wicd/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index 6332ff8ad5db..57c2e1d6d3c8 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchurl, python, pygobject, pycairo, pyGtkGlade, pythonDBus, - wpa_supplicant, dhcp, dhcpcd, wirelesstools, nettools, iproute, + wpa_supplicant, dhcp, dhcpcd, wirelesstools, nettools, openresolv, iproute, locale ? "C" }: # Wicd has a ncurses interface that we do not build because it depends @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { substituteInPlace in/scripts=wicd.in --subst-var-by TEMPLATE-DEFAULT $out/share/other/dhclient.conf.template.default - sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin:${wpa_supplicant}/sbin:${dhcpcd}/sbin:${dhcp}/sbin:${wirelesstools}/sbin:${nettools}/sbin:${iproute}/sbin" in/scripts=wicd.in + sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin:${wpa_supplicant}/sbin:${dhcpcd}/sbin:${dhcp}/sbin:${wirelesstools}/sbin:${nettools}/sbin:${openresolv}/sbin:${iproute}/sbin" in/scripts=wicd.in sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pythonDBus})" in/scripts=wicd.in sed -i "4iexport LC_ALL=\\\"${locale}\\\"" in/scripts=wicd.in sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-client.in |