diff options
| author | Russell O'Connor <roconnor@theorem.ca> | 2012-04-01 22:46:15 +0000 |
|---|---|---|
| committer | Russell O'Connor <roconnor@theorem.ca> | 2012-04-01 22:46:15 +0000 |
| commit | d8e873012767d8a844edf762a94c76b140a52356 (patch) | |
| tree | 7fbe72cc922e449b9dd0c73e69fba5772c76b73e /pkgs/tools/networking/wicd | |
| parent | 25fe5d43fe11840de8b773f41665952e2fef0277 (diff) | |
| download | nixlib-d8e873012767d8a844edf762a94c76b140a52356.tar nixlib-d8e873012767d8a844edf762a94c76b140a52356.tar.gz nixlib-d8e873012767d8a844edf762a94c76b140a52356.tar.bz2 nixlib-d8e873012767d8a844edf762a94c76b140a52356.tar.lz nixlib-d8e873012767d8a844edf762a94c76b140a52356.tar.xz nixlib-d8e873012767d8a844edf762a94c76b140a52356.tar.zst nixlib-d8e873012767d8a844edf762a94c76b140a52356.zip | |
Adding support for dhcpcd to wicd.
svn path=/nixpkgs/trunk/; revision=33532
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 1f3240997d96..6332ff8ad5db 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, wirelesstools, nettools, iproute, + wpa_supplicant, dhcp, dhcpcd, wirelesstools, nettools, 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:${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:${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 |