public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "nmap: use python infra's .withPackages"

Browse Source 
This reverts commit 278d3050ae85e959e4c6485b5ad43bbba96eb829 because it
breaks zenmap:

$ zenmap
Could not import the zenmapGUI.App module: 'No module named zenmapGUI.App'.
I checked in these directories:
    /nix/store/2hiz11plgjdrk2mziwc2jcxqalqh9hii-nmap-graphical-7.12/bin
    /home/bfo/forks/nixpkgs
    /nix/store/0l4lriqf07qah8c0kh9kcyc8l5iyij16-python-2.7.12/lib/python27.zip
    /nix/store/0l4lriqf07qah8c0kh9kcyc8l5iyij16-python-2.7.12/lib/python2.7
    /nix/store/0l4lriqf07qah8c0kh9kcyc8l5iyij16-python-2.7.12/lib/python2.7/plat-linux2
    /nix/store/0l4lriqf07qah8c0kh9kcyc8l5iyij16-python-2.7.12/lib/python2.7/lib-tk
    /nix/store/0l4lriqf07qah8c0kh9kcyc8l5iyij16-python-2.7.12/lib/python2.7/lib-old
    /nix/store/0l4lriqf07qah8c0kh9kcyc8l5iyij16-python-2.7.12/lib/python2.7/lib-dynload
    /nix/store/0l4lriqf07qah8c0kh9kcyc8l5iyij16-python-2.7.12/lib/python2.7/site-packages
If you installed Zenmap in another directory, you may have to add the
modules directory to the PYTHONPATH environment variable.
This commit is contained in:
Bjørn Forsman 2017-01-21 14:25:19 +01:00
parent 3d10d5ffdc
commit 2bf0fd0f29
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/tools/security/nmap/default.nix
View File

@ -1,12 +1,13 @@
{ stdenv, fetchurl, libpcap, pkgconfig, openssl { stdenv, fetchurl, libpcap, pkgconfig, openssl
, graphicalSupport ? false , graphicalSupport ? false
, gtk2 ? null
, libX11 ? null , libX11 ? null
, gtk2 ? null
, withPython ? false # required for the `ndiff` binary , withPython ? false # required for the `ndiff` binary
, python2 ? null , python2Packages ? null
, makeWrapper ? null
}: }:
assert withPython -> python2 != null; assert withPython -> python2Packages != null;
with stdenv.lib; with stdenv.lib;
@ -16,10 +17,6 @@ let
# so automatically enable pythonSupport if graphicalSupport is requested. # so automatically enable pythonSupport if graphicalSupport is requested.
pythonSupport = withPython || graphicalSupport; pythonSupport = withPython || graphicalSupport;
pythonEnv = python2.withPackages(ps: with ps; []
++ optionals graphicalSupport [ pycairo pygobject2 pygtk pysqlite ]
);
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "nmap${optionalString graphicalSupport "-graphical"}-${version}"; name = "nmap${optionalString graphicalSupport "-graphical"}-${version}";
version = "7.31"; version = "7.31";
@ -36,10 +33,17 @@ in stdenv.mkDerivation rec {
++ optional (!graphicalSupport) "--without-zenmap" ++ optional (!graphicalSupport) "--without-zenmap"
; ;
buildInputs = [ libpcap pkgconfig openssl ] postInstall = optionalString pythonSupport ''
++ optional pythonSupport pythonEnv wrapProgram $out/bin/ndiff --prefix PYTHONPATH : "$(toPythonPath $out)" --prefix PYTHONPATH : "$PYTHONPATH"
++ optionals graphicalSupport [ gtk2 libX11 ] '' + 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
'';
buildInputs = with python2Packages; [ libpcap pkgconfig openssl ]
++ optionals pythonSupport [ makeWrapper python ]
++ optionals graphicalSupport [
libX11 gtk2 pygtk pysqlite pygobject2 pycairo
];
meta = { meta = {
description = "A free and open source utility for network discovery and security auditing"; description = "A free and open source utility for network discovery and security auditing";