all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
blob 93817f42cfdcead16c4d5219ae4ee92a42148477 1249 bytes (raw)
name: gnu/packages/patches/bees-beesd-honor-destdir-on-installation.patch 	 # note: path name is non-authoritative(*)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
 
From 66b00f8a972ebb4da68f7aa0d0656f43ce2a2c3a Mon Sep 17 00:00:00 2001
From: Hilton Chain <hako@ultrarare.space>
Date: Fri, 23 Dec 2022 11:04:46 +0800
Subject: [PATCH] beesd: Honor DESTDIR on installation.

Co-authored-by: Adam Faiz <adam.faiz@disroot.org>
Signed-off-by: Hilton Chain <hako@ultrarare.space>
---
 Defines.mk       | 1 +
 scripts/beesd.in | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Defines.mk b/Defines.mk
index 9e8df40..e5394ba 100644
--- a/Defines.mk
+++ b/Defines.mk
@@ -2,6 +2,7 @@ MAKE += PREFIX=$(PREFIX) LIBEXEC_PREFIX=$(LIBEXEC_PREFIX) ETC_PREFIX=$(ETC_PREFI

 define TEMPLATE_COMPILER =
 sed $< >$@ \
+		-e's#@DESTDIR@#$(DESTDIR)#' \
 		-e's#@PREFIX@#$(PREFIX)#' \
 		-e's#@ETC_PREFIX@#$(ETC_PREFIX)#' \
 		-e's#@LIBEXEC_PREFIX@#$(LIBEXEC_PREFIX)#'
diff --git a/scripts/beesd.in b/scripts/beesd.in
index 174bb6c..35d04aa 100755
--- a/scripts/beesd.in
+++ b/scripts/beesd.in
@@ -15,7 +15,7 @@ readonly AL128K="$((128*1024))"
 readonly AL16M="$((16*1024*1024))"
 readonly CONFIG_DIR=@ETC_PREFIX@/bees/

-readonly bees_bin=$(realpath @LIBEXEC_PREFIX@/bees)
+readonly bees_bin=$(realpath @DESTDIR@/@LIBEXEC_PREFIX@/bees)

 command -v "$bees_bin" &> /dev/null || ERRO "Missing 'bees' agent"

--
2.38.1


debug log:

solving 4800bfc618 ...
found 4800bfc618 in https://yhetil.org/guix/874jtm7hm0.wl-hako@ultrarare.space/

applying [1/1] https://yhetil.org/guix/874jtm7hm0.wl-hako@ultrarare.space/
diff --git a/gnu/packages/patches/bees-beesd-honor-destdir-on-installation.patch b/gnu/packages/patches/bees-beesd-honor-destdir-on-installation.patch
new file mode 100644
index 0000000000..4800bfc618

1:28: space before tab in indent.
 		-e's#@PREFIX@#$(PREFIX)#' \
1:29: space before tab in indent.
 		-e's#@ETC_PREFIX@#$(ETC_PREFIX)#' \
1:30: space before tab in indent.
 		-e's#@LIBEXEC_PREFIX@#$(LIBEXEC_PREFIX)#'
Checking patch gnu/packages/patches/bees-beesd-honor-destdir-on-installation.patch...
1:46: new blank line at EOF.
+
Applied patch gnu/packages/patches/bees-beesd-honor-destdir-on-installation.patch cleanly.
warning: 4 lines add whitespace errors.

index at:
100644 93817f42cfdcead16c4d5219ae4ee92a42148477	gnu/packages/patches/bees-beesd-honor-destdir-on-installation.patch

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.