Subject: bug#68011: closed (close issue)

From: [email-masked] (GNU bug Tracking System)
Date: Sat, 09 Nov 2024 10:52:02 +0000

Your bug report

#68011: [PATCH] gnu: thinkfan: Don't fake SystemD or OpenRC presences.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
68011: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=68011
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: close issue
From: [email-masked]
To: [email-masked]
Date: Sat, 09 Nov 2024 11:51:31 +0100
List-Id: <debbugs-submit.debbugs.gnu.org>

Subject: [PATCH] gnu: thinkfan: Don't fake SystemD or OpenRC presences.
From: [email-masked]
To: [email-masked]
Date: Sun, 24 Dec 2023 18:48:00 +0000
List-Id: <debbugs-submit.debbugs.gnu.org>

This patch removes the modification to CMakeLists.txt made to fake the 
presence of SystemD and OpenRC, since it doesn't provide any actual 
utility for Guix, and places thinkfan.pid in a non-default place: 
/run/thinkfan.pid. This patch corrects it, placing the pid file in 
/var/run/, like wpa_supplicant, dhclient, syslog, tor, thermald and 
other Guix Services.

From 13132e9535fd390cf93556436537108b4cab3799 Mon Sep 17 00:00:00 2001
From: Luis Guilherme Coelho <[email-masked]>
Date: Sun, 24 Dec 2023 15:42:02 -0300
Subject: [PATCH] gnu: thinkfan: Don't fake Systemd or OpenRC presences

---
 gnu/packages/linux.scm | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 2d9e4cebbe..887a02d79f 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -6478,17 +6478,8 @@ (define-public thinkfan
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'create-init-scripts
-            ;; CMakeLists.txt relies on build-time symptoms of OpenRC and
-            ;; systemd to patch and install their service files.  Fake their
-            ;; presence rather than duplicating the build system below.  Leave
-            ;; things like ‘/bin/kill’ because they're not worth a dependency.
-            ;; The sysvinit needs manual patching, but since upstream doesn't
-            ;; even provide the option to install it: don't.
             (lambda _
-              (substitute* "CMakeLists.txt"
-                (("pkg_check_modules\\((OPENRC|SYSTEMD) .*" _ package)
-                 (format #f "option(~a_FOUND \"Faked\" ON)\n" package))
-                ;; That was easy!  Now we just need to fix the destinations.
+                ;; Fix the destinations.
                 (("/etc" directory)
                  (string-append #$output directory))))))))
     (native-inputs
-- 
2.41.0