[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
09/12: gnu: umockdev: Reference 'env' and 'sh' by absolute path.
From: |
guix-commits |
Subject: |
09/12: gnu: umockdev: Reference 'env' and 'sh' by absolute path. |
Date: |
Fri, 18 Feb 2022 08:15:58 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 569d7ba38c596ad092e5cd3b44922a6ba402da19
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Thu Feb 17 18:30:00 2022 +0000
gnu: umockdev: Reference 'env' and 'sh' by absolute path.
* gnu/packages/check.scm
(umockdev)[inputs]: Add 'bash-minimal' and 'coreutils-minimal'.
(umockdev)[arguments]<#:phases>{absolute-filenames}: New phase.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
gnu/packages/check.scm | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 8d422d4b85..68a0ac7a84 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -37,6 +37,7 @@
;;; Copyright © 2020 Tanguy Le Carrour <tanguy@bioneland.org>
;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Hugo Lecomte <hugo.lecomte@inria.fr>
+;;; Copyright © 2022 Maxime Devos <maximedevos@telenet.be>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -2890,7 +2891,14 @@ provides a simple way to achieve this.")
(add-after 'unpack 'fix-test
(lambda _
(substitute* "tests/test-umockdev.c"
- (("/run") "/tmp")))))))
+ (("/run") "/tmp"))))
+ (add-after 'install 'absolute-filenames
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; 'patch-shebangs' will take care of the shebang.
+ (substitute* (string-append #$output
"/bin/umockdev-wrapper")
+ (("env") (search-input-file inputs "bin/env"))
+ (("libumockdev")
+ (string-append #$output "/lib/libumockdev"))))))))
(native-inputs
(list vala
gobject-introspection
@@ -2900,7 +2908,9 @@ provides a simple way to achieve this.")
python
which))
(inputs
- (list glib eudev libgudev))
+ (list bash-minimal ;for umockdev-wrapper
+ coreutils-minimal ;for bin/env
+ glib eudev libgudev))
(home-page "https://github.com/martinpitt/umockdev/")
(synopsis "Mock hardware devices for creating unit tests")
(description "umockdev mocks hardware devices for creating integration
- 05/12: services: qemu-guest-agent: Fix implementation., (continued)
- 05/12: services: qemu-guest-agent: Fix implementation., guix-commits, 2022/02/18
- 02/12: packages: 'package-transitive-supported-systems' ignores '%current-target-system'., guix-commits, 2022/02/18
- 07/12: gnu: upower: Update to 0.99.15., guix-commits, 2022/02/18
- 06/12: gnu: upower: Make it auto-updatable., guix-commits, 2022/02/18
- 11/12: gnu: upower: Remove obsolete phase, guix-commits, 2022/02/18
- 08/12: gnu: umockdev: Use G-expressions., guix-commits, 2022/02/18
- 04/12: guix build: Warn when attempting to build an unsupported package., guix-commits, 2022/02/18
- 03/12: profiles: 'profile-derivation' rejects unsupported packages., guix-commits, 2022/02/18
- 01/12: doc: Typographical tweaks., guix-commits, 2022/02/18
- 10/12: gnu: umockdev: Reference libumockdev by absolute path., guix-commits, 2022/02/18
- 09/12: gnu: umockdev: Reference 'env' and 'sh' by absolute path.,
guix-commits <=
- 12/12: gnu: lsh: Build with optimizations., guix-commits, 2022/02/18