[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/07: gnu: createrepo-c: Use gexps.
From: |
guix-commits |
Subject: |
04/07: gnu: createrepo-c: Use gexps. |
Date: |
Tue, 2 Aug 2022 15:11:41 -0400 (EDT) |
apteryx pushed a commit to branch master
in repository guix.
commit c162dc379ccbfebcd15ae98791ce4e68249322b7
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Tue Aug 2 14:29:52 2022 -0400
gnu: createrepo-c: Use gexps.
* gnu/packages/rpm.scm (createrepo-c)
[phases]: Use gexps.
---
gnu/packages/rpm.scm | 36 +++++++++++++++++++-----------------
1 file changed, 19 insertions(+), 17 deletions(-)
diff --git a/gnu/packages/rpm.scm b/gnu/packages/rpm.scm
index 431c2b8e5d..0a785382d5 100644
--- a/gnu/packages/rpm.scm
+++ b/gnu/packages/rpm.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -19,6 +19,7 @@
(define-module (gnu packages rpm)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix download)
+ #:use-module (guix gexp)
#:use-module (guix git-download)
#:use-module (guix packages)
#:use-module (guix build-system cmake)
@@ -157,25 +158,26 @@ information on multiple streams, default data and
translations).")
"175na06mjyr8ws5pkknaicpziayj6p0xaanv62d54c6zxl4w484w"))))
(build-system cmake-build-system)
(arguments
- `(#:imported-modules (,@%cmake-build-system-modules
+ (list
+ #:imported-modules `(,@%cmake-build-system-modules
(guix build python-build-system))
- #:modules ((guix build cmake-build-system)
+ #:modules '((guix build cmake-build-system)
((guix build python-build-system) #:prefix python:)
(guix build utils))
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-python-site-prefix
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (substitute* "src/python/CMakeLists.txt"
- (("EXECUTE_PROCESS.*OUTPUT_VARIABLE PYTHON_INSTALL_DIR.*")
- (format #f "set (PYTHON_INSTALL_DIR ~a)~%"
- (python:site-packages inputs outputs))))))
- (add-after 'unpack 'fix-bash-completion-prefix
- (lambda* (#:key outputs #:allow-other-keys)
- (substitute* "CMakeLists.txt"
- (("execute_process.*OUTPUT_VARIABLE BASHCOMP_DIR.*")
- (format #f "set (BASHCOMP_DIR ~a\
-/share/bash-completion/completions)~%" (assoc-ref outputs "out")))))))))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-python-site-prefix
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (substitute* "src/python/CMakeLists.txt"
+ (("EXECUTE_PROCESS.*OUTPUT_VARIABLE PYTHON_INSTALL_DIR.*")
+ (format #f "set (PYTHON_INSTALL_DIR ~a)~%"
+ (python:site-packages inputs outputs))))))
+ (add-after 'unpack 'fix-bash-completion-prefix
+ (lambda _
+ (substitute* "CMakeLists.txt"
+ (("execute_process.*OUTPUT_VARIABLE BASHCOMP_DIR.*")
+ (format #f "set (BASHCOMP_DIR ~a\
+/share/bash-completion/completions)~%" #$output))))))))
(native-inputs
(list bash-completion pkg-config python))
(inputs
- branch master updated (f0be1b82dc -> 1a5384e9a7), guix-commits, 2022/08/02
- 03/07: gnu: libmodulemd: Fix build and use new style inputs and gexps., guix-commits, 2022/08/02
- 07/07: gnu: createrepo-c: Update to 0.20.1., guix-commits, 2022/08/02
- 04/07: gnu: createrepo-c: Use gexps.,
guix-commits <=
- 06/07: gnu: zchunk: Update to 1.2.2., guix-commits, 2022/08/02
- 01/07: gnu: rpm: Make popt a propagated input., guix-commits, 2022/08/02
- 05/07: gnu: drpm: Update to 0.5.1., guix-commits, 2022/08/02
- 02/07: gnu: rpm: Update to 4.17.1., guix-commits, 2022/08/02