From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hartmut Goebel Subject: [PATCH 4/4] gnu: kauth: Fix cmake macros to be used by other packages. Date: Mon, 28 Nov 2016 23:20:12 +0100 Message-ID: <1480371612-23822-5-git-send-email-h.goebel@crazy-compilers.com> References: <1480371612-23822-1-git-send-email-h.goebel@crazy-compilers.com> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:45181) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cBUHi-00048d-7i for guix-devel@gnu.org; Mon, 28 Nov 2016 17:20:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cBUHh-0004bv-Fv for guix-devel@gnu.org; Mon, 28 Nov 2016 17:20:26 -0500 Received: from mail-out.m-online.net ([212.18.0.9]:42894) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cBUHh-0004bU-AE for guix-devel@gnu.org; Mon, 28 Nov 2016 17:20:25 -0500 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3tSLj43DFwz3hjQq for ; Mon, 28 Nov 2016 23:20:24 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3tSLj437bxzvkWv for ; Mon, 28 Nov 2016 23:20:24 +0100 (CET) Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.68]) (amavisd-new, port 10024) with ESMTP id nqzpukP5NXdp for ; Mon, 28 Nov 2016 23:20:23 +0100 (CET) Received: from hermia.goebel-consult.de (ppp-188-174-142-47.dynamic.mnet-online.de [188.174.142.47]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for ; Mon, 28 Nov 2016 23:20:23 +0100 (CET) Received: from thisbe.goebel-consult.de.fritz.box (thisbe.fritz.box [192.168.110.23]) by hermia.goebel-consult.de (Postfix) with ESMTP id 1A99B60E22 for ; Mon, 28 Nov 2016 23:20:13 +0100 (CET) In-Reply-To: <1480371612-23822-1-git-send-email-h.goebel@crazy-compilers.com> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org * gnu/packages/kde-framework.scm (kauth)[phases]: New phase fix-cmake-install-paths. --- gnu/packages/kde-frameworks.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 415b54d..fb7d7d9 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1202,6 +1202,17 @@ uses a job-based interface to queue tasks and execute them in an efficient way." (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-cmake-install-paths + (lambda _ + ;; Make packages using kauth put their policy files and helpers + ;; into their own prefix + (substitute* "KF5AuthConfig.cmake.in" + (("@KAUTH_POLICY_FILES_INSTALL_DIR@") + "${KDE_INSTALL_DATADIR}/polkit-1/actions") + (("@KAUTH_HELPER_INSTALL_DIR@") + "${KDE_INSTALL_LIBEXECDIR}") + (("@KAUTH_HELPER_INSTALL_ABSOLUTE_DIR@") + "${KDE_INSTALL_LIBEXECDIR}")))) (replace 'check (lambda _ (setenv "DBUS_FATAL_WARNINGS" "0") -- 2.7.4