Re: [PATCH 1/1] gnu: polkit: Fix detection of mozjs-17.

[宋文武]

Leo Famulari <address@hidden> 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.