unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Brice Waegeneire <brice@waegenei.re>
To: 48980@debbugs.gnu.org
Subject: [bug#48980] [PATCH 1/2] gnu: icecat: Add WebAuthn support.
Date: Sat, 12 Jun 2021 23:19:30 +0200	[thread overview]
Message-ID: <20210612211931.11736-1-brice@waegenei.re> (raw)
In-Reply-To: <20210612211630.10339-1-brice@waegenei.re>

* gnu/packages/gnuzilla.scm (icecat)[inputs]: Add eudev.
[phases]: Add eudev to the wrapper.
---
 gnu/packages/gnuzilla.scm | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index c63809c20c..6255d56f16 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -15,6 +15,7 @@
 ;;; Copyright © 2019, 2020 Adrian Malacoda <malacoda@monarch-pass.net>
 ;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de>
 ;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
+;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -910,6 +911,7 @@ from forcing GEXP-PROMISE."
        ;; UNBUNDLE-ME! ("nss" ,nss)
        ("shared-mime-info" ,shared-mime-info)
        ;; UNBUNDLE-ME! ("sqlite" ,sqlite)
+       ("eudev" ,eudev)
        ("unzip" ,unzip)
        ("zip" ,zip)
        ;; UNBUNDLE-ME! ("zlib" ,zlib)
@@ -1271,19 +1273,20 @@ from forcing GEXP-PROMISE."
                     (lib (string-append out "/lib"))
                     (gtk (assoc-ref inputs "gtk+"))
                     (gtk-share (string-append gtk "/share"))
-                    (mesa (assoc-ref inputs "mesa"))
-                    (mesa-lib (string-append mesa "/lib"))
-                    (pulseaudio (assoc-ref inputs "pulseaudio"))
-                    (pulseaudio-lib (string-append pulseaudio "/lib"))
-                    (libxscrnsaver (assoc-ref inputs "libxscrnsaver"))
-                    (libxscrnsaver-lib (string-append libxscrnsaver "/lib")))
+                    (ld-libs (map (lambda (lib)
+                                    (string-append (assoc-ref inputs lib)
+                                                   "/lib"))
+                              '("libxscrnsaver"
+                                "mesa"
+                                "udev"
+                                "pulseaudio"))))
                (wrap-program (car (find-files lib "^icecat$"))
                  `("XDG_DATA_DIRS" prefix (,gtk-share))
                  ;; The following line is commented out because the icecat
                  ;; package on guix has been observed to be unstable when
                  ;; using wayland, and the bundled extensions stop working.
                  ;;   `("MOZ_ENABLE_WAYLAND" = ("1"))
-                 `("LD_LIBRARY_PATH" prefix (,pulseaudio-lib ,mesa-lib ,libxscrnsaver-lib)))
+                 `("LD_LIBRARY_PATH" prefix ,ld-libs))
                #t))))))
     (home-page "https://www.gnu.org/software/gnuzilla/")
     (synopsis "Entirely free browser derived from Mozilla Firefox")
-- 
2.31.1





  reply	other threads:[~2021-06-12 21:20 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-12 21:16 [bug#48980] [PATCH 0/2] icecat, icedove: Add U2F and WebAuthn support Brice Waegeneire
2021-06-12 21:19 ` Brice Waegeneire [this message]
2021-06-12 21:19 ` [bug#48980] [PATCH 2/2] gnu: icedove: Add " Brice Waegeneire
2021-06-12 22:09   ` Jonathan Brielmaier
2021-06-13  7:51     ` [bug#48980] [PATCH 0/2] icecat, icedove: Add U2F and " Brice Waegeneire
2021-06-20  9:32 ` [bug#48980] [PATCH v2 1/2] gnu: icecat: Add " Brice Waegeneire
2021-06-20  9:32   ` [bug#48980] [PATCH v2 2/2] gnu: icedove: " Brice Waegeneire
2021-06-23 21:09 ` [bug#48980] [PATCH 0/2] icecat, icedove: Add U2F and " Jonathan Brielmaier
2021-07-03 15:55   ` Brice Waegeneire
2021-07-03 17:18     ` Mark H Weaver
2021-07-03 20:15       ` [bug#49362] [PATCH v3] gnu: icecat: Add " Brice Waegeneire
2021-09-04  7:39         ` bug#49362: " Brice Waegeneire

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210612211931.11736-1-brice@waegenei.re \
    --to=brice@waegenei.re \
    --cc=48980@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).