From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: [PATCH 1/1] gnu: polkit: Fix detection of mozjs-17. Date: Fri, 22 Jan 2016 03:42:19 -0500 Message-ID: <2c31139f779dd0fc101c96984d47138bbade7f8b.1453452097.git.leo@famulari.name> References: Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:57228) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aMXIZ-0008GV-7P for guix-devel@gnu.org; Fri, 22 Jan 2016 03:42:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aMXIW-0004MQ-R0 for guix-devel@gnu.org; Fri, 22 Jan 2016 03:42:27 -0500 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:38207) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aMXIW-0004MA-NJ for guix-devel@gnu.org; Fri, 22 Jan 2016 03:42:24 -0500 Received: from jasmine.lan (c-69-249-5-231.hsd1.pa.comcast.net [69.249.5.231]) by mail.messagingengine.com (Postfix) with ESMTPA id C20A0680163 for ; Fri, 22 Jan 2016 03:42:21 -0500 (EST) In-Reply-To: In-Reply-To: References: 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-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org * gnu/packages/polkit.scm (polkit)[arguments]: Add LIBJS_LIBS and LIBJS_CFLAGS for mozjs-17. --- gnu/packages/polkit.scm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/gnu/packages/polkit.scm b/gnu/packages/polkit.scm index 4cafb45..3a119c2 100644 --- a/gnu/packages/polkit.scm +++ b/gnu/packages/polkit.scm @@ -80,7 +80,7 @@ `(("expat" ,expat) ("linux-pam" ,linux-pam) ("elogind" ,elogind) - ("mozjs" ,mozjs) + ("mozjs-17" ,mozjs) ("nspr" ,nspr))) (propagated-inputs `(("glib" ,glib))) ; required by polkit-gobject-1.pc @@ -90,8 +90,16 @@ ("intltool" ,intltool) ("gobject-introspection" ,gobject-introspection))) (arguments - `(#:configure-flags '("--sysconfdir=/etc" - "--enable-man-pages") + `(#:configure-flags + (let ((libjs (assoc-ref %build-inputs "mozjs-17"))) + (list + "--sysconfdir=/etc" + "--enable-man-pages" + ;; FIXME: Make this use pkg-config + (string-append "LIBJS_CFLAGS=" + "-include " libjs "/include/js-./js/RequiredDefines.h" + " -I" libjs "/include/js-.") + (string-append "LIBJS_LIBS=-L" libjs "/lib -lmozjs-."))) #:phases (modify-phases %standard-phases (add-after -- 2.7.0.rc3