diff options
Diffstat (limited to 'pkgs/tools/security')
| -rw-r--r-- | pkgs/tools/security/jd-gui/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/security/nmap/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/security/tor/torbrowser.nix | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/tools/security/jd-gui/default.nix b/pkgs/tools/security/jd-gui/default.nix index f247f8c4e89e..106fbf0a150a 100644 --- a/pkgs/tools/security/jd-gui/default.nix +++ b/pkgs/tools/security/jd-gui/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, gtk, atk, gdk_pixbuf, pango, makeWrapper }: +{ stdenv, fetchurl, gtk2, atk, gdk_pixbuf, pango, makeWrapper }: let dynlibPath = stdenv.lib.makeLibraryPath - [ gtk atk gdk_pixbuf pango ]; + [ gtk2 atk gdk_pixbuf pango ]; in stdenv.mkDerivation rec { name = "jd-gui-${version}"; diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index f9c7dba5660b..e1a46cf2b82a 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -9,7 +9,7 @@ with stdenv.lib; let - inherit (pythonPackages) python pygtk pygobject pycairo pysqlite; + inherit (pythonPackages) python pygtk pygobject2 pycairo pysqlite; in stdenv.mkDerivation rec { name = "nmap${optionalString graphicalSupport "-graphical"}-${version}"; version = "7.12"; @@ -26,12 +26,12 @@ in stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/ndiff --prefix PYTHONPATH : "$(toPythonPath $out)" --prefix PYTHONPATH : "$PYTHONPATH" '' + optionalString graphicalSupport '' - wrapProgram $out/bin/zenmap --prefix PYTHONPATH : "$(toPythonPath $out)" --prefix PYTHONPATH : "$PYTHONPATH" --prefix PYTHONPATH : $(toPythonPath ${pygtk})/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath ${pygobject})/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath ${pycairo})/gtk-2.0 + wrapProgram $out/bin/zenmap --prefix PYTHONPATH : "$(toPythonPath $out)" --prefix PYTHONPATH : "$PYTHONPATH" --prefix PYTHONPATH : $(toPythonPath ${pygtk})/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath ${pygobject2})/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath ${pycairo})/gtk-2.0 ''; buildInputs = [ libpcap pkgconfig openssl makeWrapper python ] ++ optionals graphicalSupport [ - libX11 gtk pygtk pysqlite pygobject pycairo + libX11 gtk pygtk pysqlite pygobject2 pycairo ]; meta = { diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix index da45866ed2fe..57fcfe717be0 100644 --- a/pkgs/tools/security/tor/torbrowser.nix +++ b/pkgs/tools/security/tor/torbrowser.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeDesktopItem -, libXrender, libX11, libXext, libXt, alsaLib, dbus, dbus_glib, glib, gtk +, libXrender, libX11, libXext, libXt, alsaLib, dbus, dbus_glib, glib, gtk2 , atk, pango, freetype, fontconfig, gdk_pixbuf, cairo, zlib }: let libPath = stdenv.lib.makeLibraryPath [ - stdenv.cc.cc zlib glib alsaLib dbus dbus_glib gtk atk pango freetype + stdenv.cc.cc zlib glib alsaLib dbus dbus_glib gtk2 atk pango freetype fontconfig gdk_pixbuf cairo libXrender libX11 libXext libXt ]; in |