[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
16/17: gnu: policycoreutils: Use G-expression.
From: |
guix-commits |
Subject: |
16/17: gnu: policycoreutils: Use G-expression. |
Date: |
Sat, 13 Aug 2022 13:26:50 -0400 (EDT) |
mbakke pushed a commit to branch master
in repository guix.
commit e015fc174e13759aa9c96dc19bf534efd1be7d72
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sat Aug 13 14:13:10 2022 +0200
gnu: policycoreutils: Use G-expression.
* gnu/packages/selinux.scm (policycoreutils)[arguments]: Convert to gexp.
---
gnu/packages/selinux.scm | 75 ++++++++++++++++++++++++------------------------
1 file changed, 38 insertions(+), 37 deletions(-)
diff --git a/gnu/packages/selinux.scm b/gnu/packages/selinux.scm
index e4c57f4747..b4f074b695 100644
--- a/gnu/packages/selinux.scm
+++ b/gnu/packages/selinux.scm
@@ -354,43 +354,44 @@ tools, and libraries designed to facilitate SELinux
policy analysis.")
(package/inherit libsepol
(name "policycoreutils")
(arguments
- `(#:test-target "test"
- #:make-flags
- (let ((out (assoc-ref %outputs "out")))
- (list (string-append "CC=" ,(cc-for-target))
- (string-append "PREFIX=" out)
- (string-append "LOCALEDIR=" out "/share/locale")
- (string-append "BASHCOMPLETIONDIR=" out
- "/share/bash-completion/completions")
- "INSTALL=install -c -p"
- "INSTALL_DIR=install -d"
- ;; These ones are needed because some Makefiles define the
- ;; directories relative to DESTDIR, not relative to PREFIX.
- (string-append "SBINDIR=" out "/sbin")
- (string-append "ETCDIR=" out "/etc")
- (string-append "SYSCONFDIR=" out "/etc/sysconfig")
- (string-append "MAN5DIR=" out "/share/man/man5")
- (string-append "INSTALL_NLS_DIR=" out "/share/locale")
- (string-append "AUTOSTARTDIR=" out "/etc/xdg/autostart")
- (string-append "DBUSSERVICEDIR=" out "/share/dbus-1/services")
- (string-append "SYSTEMDDIR=" out "/lib/systemd")
- (string-append "INITDIR=" out "/etc/rc.d/init.d")
- (string-append "SELINUXDIR=" out "/etc/selinux")))
- #:phases
- (modify-phases %standard-phases
- (delete 'configure)
- (add-after 'unpack 'enter-dir
- (lambda _ (chdir ,name)))
- (add-after 'enter-dir 'ignore-/usr-tests
- (lambda* (#:key inputs #:allow-other-keys)
- ;; Rewrite lookup paths for header files.
- (substitute* '("newrole/Makefile"
- "setfiles/Makefile"
- "run_init/Makefile")
- (("/usr(/include/security/pam_appl.h)" _ file)
- (search-input-file inputs file))
- (("/usr(/include/libaudit.h)" _ file)
- (search-input-file inputs file))))))))
+ (list
+ #:test-target "test"
+ #:make-flags
+ #~(let ((out #$output))
+ (list (string-append "CC=" #$(cc-for-target))
+ (string-append "PREFIX=" out)
+ (string-append "LOCALEDIR=" out "/share/locale")
+ (string-append "BASHCOMPLETIONDIR=" out
+ "/share/bash-completion/completions")
+ "INSTALL=install -c -p"
+ "INSTALL_DIR=install -d"
+ ;; These ones are needed because some Makefiles define the
+ ;; directories relative to DESTDIR, not relative to PREFIX.
+ (string-append "SBINDIR=" out "/sbin")
+ (string-append "ETCDIR=" out "/etc")
+ (string-append "SYSCONFDIR=" out "/etc/sysconfig")
+ (string-append "MAN5DIR=" out "/share/man/man5")
+ (string-append "INSTALL_NLS_DIR=" out "/share/locale")
+ (string-append "AUTOSTARTDIR=" out "/etc/xdg/autostart")
+ (string-append "DBUSSERVICEDIR=" out "/share/dbus-1/services")
+ (string-append "SYSTEMDDIR=" out "/lib/systemd")
+ (string-append "INITDIR=" out "/etc/rc.d/init.d")
+ (string-append "SELINUXDIR=" out "/etc/selinux")))
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'configure)
+ (add-after 'unpack 'enter-dir
+ (lambda _ (chdir #$name)))
+ (add-after 'enter-dir 'ignore-/usr-tests
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; Rewrite lookup paths for header files.
+ (substitute* '("newrole/Makefile"
+ "setfiles/Makefile"
+ "run_init/Makefile")
+ (("/usr(/include/security/pam_appl.h)" _ file)
+ (search-input-file inputs file))
+ (("/usr(/include/libaudit.h)" _ file)
+ (search-input-file inputs file))))))))
(inputs
(list audit
linux-pam
- branch master updated (bea916aea7 -> 33d5141239), guix-commits, 2022/08/13
- 01/17: gnu: graphviz: Add release-monitoring-url., guix-commits, 2022/08/13
- 03/17: gnu: python-numpy: Add 'upstream-name' property., guix-commits, 2022/08/13
- 05/17: gnu: python-m2r: Adjust for Python 3.10., guix-commits, 2022/08/13
- 17/17: gnu: python-setuptools: Update to 64.0.3., guix-commits, 2022/08/13
- 08/17: gnu: SELinux: Update to 3.4., guix-commits, 2022/08/13
- 09/17: gnu: checkpolicy: Remove input labels., guix-commits, 2022/08/13
- 13/17: gnu: python-sepolgen: Use G-expression and remove labels., guix-commits, 2022/08/13
- 06/17: gnu: qtractor: Fix build., guix-commits, 2022/08/13
- 16/17: gnu: policycoreutils: Use G-expression.,
guix-commits <=
- 07/17: gnu: serf: Add release-monitoring-url., guix-commits, 2022/08/13
- 10/17: gnu: libselinux: Remove input labels., guix-commits, 2022/08/13
- 15/17: gnu: libsepol: Use G-expression., guix-commits, 2022/08/13
- 02/17: gnu: python-pyaml: Update to 21.10.1., guix-commits, 2022/08/13
- 04/17: gnu: python-pre-commit: Remove unnecessary dependency., guix-commits, 2022/08/13
- 11/17: gnu: libsemanage: Remove input labels., guix-commits, 2022/08/13
- 14/17: gnu: policycoreutils: Remove input labels., guix-commits, 2022/08/13
- 12/17: gnu: secilc: Remove input labels., guix-commits, 2022/08/13