From 1fee391a254377aa7d88400eafa24105c5f26486 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 21 Feb 2023 23:37:09 -0500 Subject: [PATCH] pack: Register extra /usr/share sub-directories as FHS. * guix/rpm.scm (%fhs-directories): Add extra FHS directories. They were found to conflict while testing a 'guix pack' built Jami RPM. --- guix/rpm.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/guix/rpm.scm b/guix/rpm.scm index 1cb8326a9b..734aef29c1 100644 --- a/guix/rpm.scm +++ b/guix/rpm.scm @@ -393,8 +393,15 @@ (define %fhs-directories "/opt/info" "/opt/lib" "/opt/man" "/run" "/sbin" "/srv" "/sys" "/tmp" "/usr" "/usr/bin" "/usr/include" "/usr/libexec" + "/usr/share" "/usr/share/applications" "/usr/share/color" "/usr/share/dict" "/usr/share/doc" "/usr/share/games" - "/usr/share/info" "/usr/share/locale" "/usr/share/man" "/usr/share/misc" + "/usr/share/icons" "/usr/share/icons/hicolor" + "/usr/share/icons/hicolor/48x48" + "/usr/share/icons/hicolor/48x48/apps" + "/usr/share/icons/hicolor/scalable" + "/usr/share/icons/hicolor/scalable/apps" + "/usr/share/info" "/usr/share/locale" "/usr/share/man" + "/usr/share/metainfo" "/usr/share/misc" "/usr/share/nls" "/usr/share/ppd" "/usr/share/sgml" "/usr/share/terminfo" "/usr/share/tmac" "/usr/share/xml" "/usr/share/zoneinfo" "/usr/local" "/usr/local/bin" "/usr/local/etc"