Merge pull request #595 from grrwlf/fix-nmap

nmap: fix GUI paths
This commit is contained in:
Evgeny Egorochkin 2013-06-06 15:28:34 -07:00
commit 61baf49624
2 changed files with 18 additions and 1 deletions

View file

@ -2,7 +2,7 @@
, openssl, python, pygtk, makeWrapper, pygobject
, pycairo, pysqlite
}:
stdenv.mkDerivation rec {
name = "nmap-5.50";
@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "aa044113caa47e172c154daed73afc70ffa18d359eb47c22a9ea85ffcb14ffb8";
};
patches = [ ./zenmap.patch ];
postInstall =
''
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

View file

@ -0,0 +1,15 @@
diff -ruN nmap-5.50.orig/zenmap/zenmapCore/Paths.py nmap-5.50/zenmap/zenmapCore/Paths.py
--- nmap-5.50.orig/zenmap/zenmapCore/Paths.py 2013-06-06 05:52:10.723087428 +0000
+++ nmap-5.50/zenmap/zenmapCore/Paths.py 2013-06-06 07:07:25.481261761 +0000
@@ -115,7 +115,10 @@
else:
# Normal script execution. Look in the current directory to allow
# running from the distribution.
- return os.path.abspath(os.path.dirname(fs_dec(sys.argv[0])))
+ #
+ # Grrwlf: No,no,dear. That's not a script, thats Nixos wrapper. Go add
+ # those '..' to substract /bin part.
+ return os.path.abspath(os.path.join(os.path.dirname(fs_dec(sys.argv[0])), ".."))
prefix = get_prefix()