HCoop
/
jackhill
/
guix
/
guix.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into core-updates
[jackhill/guix/guix.git]
/
gnu
/
packages
/
selinux.scm
diff --git
a/gnu/packages/selinux.scm
b/gnu/packages/selinux.scm
index
9562123
..
1c45cb8
100644
(file)
--- a/
gnu/packages/selinux.scm
+++ b/
gnu/packages/selinux.scm
@@
-1,5
+1,6
@@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016, 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016, 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
;;;
;;; This file is part of GNU Guix.
;;;
@@
-36,6
+37,7
@@
#:use-module (gnu packages pcre)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages pcre)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
+ #:use-module (gnu packages python-xyz)
#:use-module (gnu packages swig)
#:use-module (gnu packages textutils)
#:use-module (gnu packages xml))
#:use-module (gnu packages swig)
#:use-module (gnu packages textutils)
#:use-module (gnu packages xml))
@@
-129,6
+131,7
@@
module into a binary representation.")
(define-public libselinux
(package (inherit libsepol)
(name "libselinux")
(define-public libselinux
(package (inherit libsepol)
(name "libselinux")
+ (outputs '("out" "python"))
(arguments
(substitute-keyword-arguments (package-arguments libsepol)
((#:make-flags flags)
(arguments
(substitute-keyword-arguments (package-arguments libsepol)
((#:make-flags flags)
@@
-137,7
+140,7
@@
module into a binary representation.")
(assoc-ref %build-inputs "libsepol")
"/lib/libsepol.a")
(string-append "PYSITEDIR="
(assoc-ref %build-inputs "libsepol")
"/lib/libsepol.a")
(string-append "PYSITEDIR="
- (assoc-ref %outputs "
out
")
+ (assoc-ref %outputs "
python
")
"/lib/python"
,(version-major+minor (package-version python))
"/site-packages/")
"/lib/python"
,(version-major+minor (package-version python))
"/site-packages/")
@@
-201,10
+204,10
@@
the core SELinux management utilities.")
(lambda _ (chdir ,name) #t))
(add-after 'build 'pywrap
(lambda* (#:key make-flags #:allow-other-keys)
(lambda _ (chdir ,name) #t))
(add-after 'build 'pywrap
(lambda* (#:key make-flags #:allow-other-keys)
- (
zero? (apply system* "make" "pywrap" make-flags)
)))
+ (
apply invoke "make" "pywrap" make-flags
)))
(add-after 'install 'install-pywrap
(lambda* (#:key make-flags #:allow-other-keys)
(add-after 'install 'install-pywrap
(lambda* (#:key make-flags #:allow-other-keys)
- (
zero? (apply system* "make" "install-pywrap" make-flags)
)))))))
+ (
apply invoke "make" "install-pywrap" make-flags
)))))))
(inputs
`(("libsepol" ,libsepol)
("libselinux" ,libselinux)
(inputs
`(("libsepol" ,libsepol)
("libselinux" ,libselinux)