diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-08-17 19:42:58 +0200 |
---|---|---|
committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-08-17 19:43:43 +0200 |
commit | b4cc9bd63a6df61f376405f550e577e7b7377152 (patch) | |
tree | 8d037018e77064ac913ca089e25db210a4c3b775 /pkgs/tools/networking | |
parent | e0f124a9f814985b44a7216f010e928820ed2686 (diff) | |
parent | 963d8cc3e0c56c3149c877e399ddcfc4f95e14f9 (diff) | |
download | nixlib-b4cc9bd63a6df61f376405f550e577e7b7377152.tar nixlib-b4cc9bd63a6df61f376405f550e577e7b7377152.tar.gz nixlib-b4cc9bd63a6df61f376405f550e577e7b7377152.tar.bz2 nixlib-b4cc9bd63a6df61f376405f550e577e7b7377152.tar.lz nixlib-b4cc9bd63a6df61f376405f550e577e7b7377152.tar.xz nixlib-b4cc9bd63a6df61f376405f550e577e7b7377152.tar.zst nixlib-b4cc9bd63a6df61f376405f550e577e7b7377152.zip |
Merge remote-tracking branch 'origin/master' into hardened-stdenv
Fixes #17801 and #17802.
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r-- | pkgs/tools/networking/connman-notify/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/networking/wicd/default.nix | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/tools/networking/connman-notify/default.nix b/pkgs/tools/networking/connman-notify/default.nix index 070666901724..4f70888fca63 100644 --- a/pkgs/tools/networking/connman-notify/default.nix +++ b/pkgs/tools/networking/connman-notify/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ pythonPackages.python - pythonPackages.dbus + pythonPackages.dbus-python pythonPackages.pygobject pythonPackages.pygtk pythonPackages.notify diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index fe6ad74c2362..40acfaf323a2 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -4,7 +4,7 @@ , locale ? "C" }: let - inherit (pythonPackages) python pygobject dbus pyGtkGlade pycairo; + inherit (pythonPackages) python pygobject dbus-python pyGtkGlade pycairo; in stdenv.mkDerivation rec { name = "wicd-${version}"; version = "1.7.2.4"; @@ -38,15 +38,15 @@ in stdenv.mkDerivation rec { substituteInPlace in/scripts=wicd.in --subst-var-by TEMPLATE-DEFAULT $out/share/other/dhclient.conf.template.default sed -i "2iexport PATH=${python}/bin:${wpa_supplicant}/sbin:${dhcpcd}/sbin:${dhcp}/sbin:${wirelesstools}/sbin:${nettools}/sbin:${nettools}/bin:${iputils}/bin:${openresolv}/sbin:${iproute}/sbin\$\{PATH:+:\}\$PATH" in/scripts=wicd.in - sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pygobject}):$(toPythonPath ${dbus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd.in + sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pygobject}):$(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 ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${dbus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-client.in + sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-client.in sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-gtk.in - sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${dbus}):$(toPythonPath ${pythonPackages.notify})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-gtk.in + sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python}):$(toPythonPath ${pythonPackages.notify})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-gtk.in sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-cli.in - sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${dbus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-cli.in + sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-cli.in sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-curses.in - sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${dbus}):$(toPythonPath ${pythonPackages.urwid}):$(toPythonPath ${pythonPackages.curses})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-curses.in + sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python}):$(toPythonPath ${pythonPackages.urwid}):$(toPythonPath ${pythonPackages.curses})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-curses.in rm po/ast.po ''; |