From mboxrd@z Thu Jan  1 00:00:00 1970
From: iyzsong@member.fsf.org (=?utf-8?B?5a6L5paH5q2m?=)
Subject: Re: [PATCH 1/1] gnu: polkit: Fix detection of mozjs-17.
Date: Fri, 22 Jan 2016 18:58:40 +0800
Message-ID: <87vb6l98yn.fsf@member.fsf.org>
References: <cover.1453452097.git.leo@famulari.name>
	<cover.1453452097.git.leo@famulari.name>
	<2c31139f779dd0fc101c96984d47138bbade7f8b.1453452097.git.leo@famulari.name>
Mime-Version: 1.0
Content-Type: text/plain
Return-path: <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:37372)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <iyzsong@openmailbox.org>) id 1aMZQt-0007lj-RX
	for guix-devel@gnu.org; Fri, 22 Jan 2016 05:59:12 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <iyzsong@openmailbox.org>) id 1aMZQq-0006Ll-Kr
	for guix-devel@gnu.org; Fri, 22 Jan 2016 05:59:11 -0500
Received: from smtp3.openmailbox.org ([62.4.1.37]:49823)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <iyzsong@openmailbox.org>) id 1aMZQq-0006Lf-Ev
	for guix-devel@gnu.org; Fri, 22 Jan 2016 05:59:08 -0500
In-Reply-To: <2c31139f779dd0fc101c96984d47138bbade7f8b.1453452097.git.leo@famulari.name>
	(Leo Famulari's message of "Fri, 22 Jan 2016 03:42:19 -0500")
List-Id: "Development of GNU Guix and the GNU System distribution."
	<guix-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-devel>
List-Post: <mailto:guix-devel@gnu.org>
List-Help: <mailto:guix-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=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: Leo Famulari <leo@famulari.name>
Cc: guix-devel@gnu.org

Leo Famulari <leo@famulari.name> writes:

> * 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
Hi, I have push a commit to fix the version script of mozjs, it should
install correctly now.