From 668010ebc9fd84d9dc60f90b9a4ebf3c7054977f Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 25 Oct 2020 20:11:13 +0000 Subject: [PATCH] Fix build errors if PREFIX is different from ECM's PREFIX. See for details. --- KF5PackageMacros.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/KF5PackageMacros.cmake b/KF5PackageMacros.cmake index f4c1d1d..acd3798 100644 --- a/KF5PackageMacros.cmake +++ b/KF5PackageMacros.cmake @@ -1,6 +1,5 @@ -find_package(ECM 1.6.0 CONFIG REQUIRED) -include(${ECM_KDE_MODULE_DIR}/KDEInstallDirs.cmake) +include(KDEInstallDirs) set(KPACKAGE_RELATIVE_DATA_INSTALL_DIR "kpackage") -- GitLab zko Wojtek's customized Guix
aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2021-07-07guix-install.sh: Prompt for configuring substitutes discovery....Also ensure prompt_yes_no always print the message with a trailing space, which is more pleasing to the eye. * etc/guix-daemon.conf.in <--discover=no>: New guix-daemon option. * etc/guix-daemon.service.in: Likewise. * etc/init.d/guix-daemon.in: Likewise. * etc/openrc/guix-daemon.in: Likewise. * etc/guix-install.sh (configure_substitute_discovery): New procedure. (sys_enable_guix_daemon): Ask the user whether automatic substitute discovery should be enabled. Set the '--discover' argument accordingly. (prompt_yes_no): Add a trailing space to the message. (sys_authorize_build_farms): Remove trailing space from the message argument. * NEWS (Distribution): Add news. Maxim Cournoyer
2020-09-17guix-install.sh: Support OpenRC....* etc/guix-install.sh (chk_init_sys): Detect OpenRC. (sys_enable_guix_daemon): Install & enable the Guix daemon on such systems. * etc/openrc/guix-daemon.in: New file. * nix/local.mk: Add a rule for it. (openrcservicedir, nodist_openrcservice_DATA): New variables. (CLEANFILES, EXTRA_DIST): Add them. * .gitignore: Ignore etc/openrc/guix-daemon. Signed-off-by: Tobias Geerinckx-Rice <me@tobias.gr> Morgan Smith