mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 23:43:30 +00:00
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
This commit is contained in:
parent
fbe4e1af93
commit
f81dbf4893
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user