pkgs/tools: stdenv.lib -> lib
This commit is contained in:
@@ -7,7 +7,7 @@ let
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "wicd";
|
||||
version = "1.7.2.4";
|
||||
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://launchpad.net/wicd/1.7/${version}/+download/${pname}-${version}.tar.gz";
|
||||
sha256 = "15ywgh60xzmp5z8l1kzics7yi95isrjg1paz42dvp7dlpdfzpzfw";
|
||||
@@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
|
||||
./no-var-install.patch
|
||||
./pygtk.patch
|
||||
./no-optimization.patch
|
||||
./dhclient.patch
|
||||
./dhclient.patch
|
||||
./fix-app-icon.patch
|
||||
./fix-gtk-issues.patch
|
||||
./urwid-api-update.patch
|
||||
@@ -33,10 +33,10 @@ in stdenv.mkDerivation rec {
|
||||
postPatch = ''
|
||||
# We don't have "python2".
|
||||
substituteInPlace wicd/wicd-daemon.py --replace 'misc.find_path("python2")' "'${python.interpreter}'"
|
||||
|
||||
|
||||
substituteInPlace in/scripts=wicd.in --subst-var-by TEMPLATE-DEFAULT $out/share/other/dhclient.conf.template.default
|
||||
|
||||
sed -i "2iexport PATH=${stdenv.lib.makeBinPath [ python wpa_supplicant dhcpcd dhcp wirelesstools nettools nettools iputils openresolv iproute ]}\$\{PATH:+:\}\$PATH" in/scripts=wicd.in
|
||||
sed -i "2iexport PATH=${lib.makeBinPath [ python wpa_supplicant dhcpcd dhcp wirelesstools nettools nettools iputils openresolv iproute ]}\$\{PATH:+:\}\$PATH" in/scripts=wicd.in
|
||||
sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pygobject2}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd.in
|
||||
sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-client.in
|
||||
sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject2}):$(toPythonPath ${pygobject2})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-client.in
|
||||
|
||||
Reference in New Issue
Block a user