summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2018-12-16 19:56:50 +0200
committerEfraim Flashner <efraim@flashner.co.il>2018-12-17 12:08:01 +0200
commitcc729d257cf6a2cb865a4075fe9135716b3736c9 (patch)
treeb39dacab541926f7e8fb1cd13f6c1a7a2551de8b /gnu
parentf8be7664cbc85e6401f88afa539c5f5e800aaf03 (diff)
downloadpatches-cc729d257cf6a2cb865a4075fe9135716b3736c9.tar
patches-cc729d257cf6a2cb865a4075fe9135716b3736c9.tar.gz
gnu: nmap: Don't hardcode python version.
* gnu/packages/admin.scm (nmap)[arguments]: Replace hardcoded python version with parameterized one.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/admin.scm7
1 files changed, 5 insertions, 2 deletions
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 3e41b456e1..36d0ea879f 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -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))