nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: nmap: Don't hardcode python version. 

* gnu/packages/admin.scm (nmap)[arguments]: Replace hardcoded python
version with parameterized one.
This commit is contained in:
Efraim Flashner 2018-12-16 19:56:50 +02:00
parent f8be7664cb
commit cc729d257c
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gnu/packages/admin.scm
View File

@ -1887,7 +1887,7 @@ done with the @code{auditctl} utility.")
;; TODO Add zenmap output.
(outputs '("out" "ndiff"))
(arguments
'(#:configure-flags '("--without-zenmap")
`(#:configure-flags '("--without-zenmap")
#:phases
(modify-phases %standard-phases
(add-after 'configure 'patch-Makefile
@ -1903,7 +1903,10 @@ done with the @code{auditctl} utility.")
(string-append "prefix=" out)
args))
(define (python-path dir)
(string-append dir "/lib/python2.7/site-packages"))
(string-append dir "/lib/python"
,(version-major+minor
(package-version python))
"/site-packages"))
(let ((out (assoc-ref outputs "out"))
(ndiff (assoc-ref outputs "ndiff")))
(for-each mkdir-p (list out ndiff))