From 56bdf1a950d00f2115787f4deaa53b281cb93efe Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Mon, 27 Jan 2025 09:23:30 +0100 Subject: [PATCH] gnu: snapper: Fix dbus service paths * gnu/packages/file-systems.scm (snapper): [#:phases]: Add more PATH substitutions in files. Change-Id: I3e91d18b44f33bf389b46b5c02ba124e1929bfd6 Signed-off-by: Ian Eure --- gnu/packages/file-systems.scm | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 5fd92d08fb1..a7c4c37c165 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2024 Ahmad Draidi ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2025 Julian Flake +;;; Copyright © 2025 Ashish SHUKLA ;; ;;; This file is part of GNU Guix. ;;; @@ -1391,10 +1392,22 @@ APFS.") (("/usr/lib") (string-append out "/lib")) (("/etc/") - (string-append out "/etc/")))) - (substitute* "client/Makefile.am" - (("/usr/lib") - "@libdir@"))))))) + (string-append out "/etc/"))) + (substitute* (cons "data/org.opensuse.Snapper.service" + (find-files "scripts/" "\\.sh")) + (("/usr/bin/snapper") + (string-append out "/bin/snapper")) + (("/usr/sbin/snapperd") + (string-append out "/sbin/snapperd")) + (("/sbin/btrfs") + (which "btrfs"))) + (substitute* "scripts/snapper-hourly" + (("PATH=.*$") + (format #f "PATH=~a/sbin:~a/bin\n" + out out))) + (substitute* (find-files "." "Makefile.am") + (("/usr/lib") + "@libdir@")))))))) (home-page "https://snapper.io") (native-inputs (list glibc-locales autoconf automake libtool pkg-config))