diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-04-06 22:06:00 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-04-06 22:06:00 +0000 |
| commit | 687c2ccc17b64d6f3684d814dd84302625676836 (patch) | |
| tree | b96cd6b5d87834f66814ed205ac846ab20f754b9 /pkgs/tools/networking/wicd | |
| parent | cf00c432ae13759319ff235858000c17e26ecb8b (diff) | |
| download | nixlib-687c2ccc17b64d6f3684d814dd84302625676836.tar nixlib-687c2ccc17b64d6f3684d814dd84302625676836.tar.gz nixlib-687c2ccc17b64d6f3684d814dd84302625676836.tar.bz2 nixlib-687c2ccc17b64d6f3684d814dd84302625676836.tar.lz nixlib-687c2ccc17b64d6f3684d814dd84302625676836.tar.xz nixlib-687c2ccc17b64d6f3684d814dd84302625676836.tar.zst nixlib-687c2ccc17b64d6f3684d814dd84302625676836.zip | |
* wicd updated to 1.7.1b2, which is compatible with Python 2.7.
svn path=/nixpkgs/trunk/; revision=26727
Diffstat (limited to 'pkgs/tools/networking/wicd')
| -rw-r--r-- | pkgs/tools/networking/wicd/default.nix | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index fab91873a385..a8490e39b93d 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -6,11 +6,11 @@ # on urwid which has not been packaged at this time (2009-12-27). stdenv.mkDerivation rec { - name = "wicd-1.7.0"; + name = "wicd-1.7.1-beta2"; src = fetchurl { - url = "mirror://sourceforge/project/wicd/wicd-stable/${name}/${name}.tar.bz2"; - sha256 = "0civfmpjlsvnaiw7fkpq34mh5ndhfzb9mkl3q2d3rjd4z0mnki8l"; + url = "mirror://sourceforge/wicd/wicd-1.7.1b2.tar.bz2"; + sha256 = "13ga6a2ip8dy8h49wvv02jxxfvpk5q5sm2wz76dy62y1xsrm23c1"; }; buildInputs = [ python ]; @@ -18,8 +18,13 @@ stdenv.mkDerivation rec { patches = [ ./no-var-install.patch ./pygtk.patch ./mkdir-networks.patch ]; # Should I be using pygtk's propogated build inputs? + # !!! Should use makeWrapper. postPatch = '' + # We don't have "python2". + substituteInPlace wicd/wicd-daemon.py --replace 'misc.find_path("python2")' "'${python}/bin/python'" + 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 "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 |