diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-01-10 20:27:28 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-01-10 20:27:28 +0000 |
commit | 9c8c4159b5bcc084a208e4a23306bbee261b13ab (patch) | |
tree | 75a747884eca8d20f7f950aa7201f30ad213fc6f /pkgs/tools/networking/wicd | |
parent | 4df0f01c0fa56e1017be97a28f7dec438de7e3c1 (diff) | |
download | nixlib-9c8c4159b5bcc084a208e4a23306bbee261b13ab.tar nixlib-9c8c4159b5bcc084a208e4a23306bbee261b13ab.tar.gz nixlib-9c8c4159b5bcc084a208e4a23306bbee261b13ab.tar.bz2 nixlib-9c8c4159b5bcc084a208e4a23306bbee261b13ab.tar.lz nixlib-9c8c4159b5bcc084a208e4a23306bbee261b13ab.tar.xz nixlib-9c8c4159b5bcc084a208e4a23306bbee261b13ab.tar.zst nixlib-9c8c4159b5bcc084a208e4a23306bbee261b13ab.zip |
Fixing the style in the wicd expression, based on the recommendations
made by ludo in the mailing list. svn path=/nixpkgs/trunk/; revision=19342
Diffstat (limited to 'pkgs/tools/networking/wicd')
-rw-r--r-- | pkgs/tools/networking/wicd/default.nix | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index 95c01431c32a..52bbf7d7a1fa 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -1,8 +1,9 @@ {stdenv, fetchurl, python, pygobject, pycairo, pyGtkGlade, pythonDBus, wpa_supplicant, dhcp, wirelesstools, nettools, iproute, - locale ? "\\\"C\\\"" }: + locale ? "C" }: -# wicd has a ncurses interface that we do not build because it depends on urwid which has not been packaged at this time (2009-12-27) +# Wicd has a ncurses interface that we do not build because it depends +# on urwid which has not been packaged at this time (2009-12-27). stdenv.mkDerivation rec { name = "wicd-1.6.2.2"; @@ -20,7 +21,7 @@ stdenv.mkDerivation rec { postPatch = '' 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 "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 "4iexport LC_ALL=\\\"${locale}\\\"" in/scripts=wicd.in sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-client.in sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-client.in ''; @@ -64,15 +65,15 @@ stdenv.mkDerivation rec { meta = { homepage = http://wicd.net/; description = "A wiredless and wired network manager"; - long_description='' -A complete network connection manager -Wicd supports wired and wireless networks, and capable of -creating and tracking profiles for both. It has a -template-based wireless encryption system, which allows the user -to easily add encryption methods used. It ships with some common -encryption types, such as WPA and WEP. Wicd will automatically -connect at startup to any preferred network within range. -''; - license="GPL"; + longDescription='' + A complete network connection manager + Wicd supports wired and wireless networks, and capable of + creating and tracking profiles for both. It has a + template-based wireless encryption system, which allows the user + to easily add encryption methods used. It ships with some common + encryption types, such as WPA and WEP. Wicd will automatically + connect at startup to any preferred network within range. + ''; + license="GPLv2"; }; } |