From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id xtITEVULz2B2aQEAgWs5BA (envelope-from ) for ; Sun, 20 Jun 2021 11:33:09 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id yIAoDFULz2B2CQAAbx9fmQ (envelope-from ) for ; Sun, 20 Jun 2021 09:33:09 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id E7966B6C1 for ; Sun, 20 Jun 2021 11:33:08 +0200 (CEST) Received: from localhost ([::1]:56432 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lutpD-0008T4-UO for larch@yhetil.org; Sun, 20 Jun 2021 05:33:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41064) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lutp8-0008Sm-Gx for guix-patches@gnu.org; Sun, 20 Jun 2021 05:33:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49772) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lutp8-0007Hl-6f for guix-patches@gnu.org; Sun, 20 Jun 2021 05:33:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lutp8-0004U1-2O for guix-patches@gnu.org; Sun, 20 Jun 2021 05:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48980] [PATCH v2 1/2] gnu: icecat: Add WebAuthn support. Resent-From: Brice Waegeneire Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 20 Jun 2021 09:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48980 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48980@debbugs.gnu.org Received: via spool by 48980-submit@debbugs.gnu.org id=B48980.162418155317179 (code B ref 48980); Sun, 20 Jun 2021 09:33:02 +0000 Received: (at 48980) by debbugs.gnu.org; 20 Jun 2021 09:32:33 +0000 Received: from localhost ([127.0.0.1]:33083 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lutoe-0004Sw-Vk for submit@debbugs.gnu.org; Sun, 20 Jun 2021 05:32:33 -0400 Received: from relay7-d.mail.gandi.net ([217.70.183.200]:33971) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lutod-0004Se-Cq for 48980@debbugs.gnu.org; Sun, 20 Jun 2021 05:32:32 -0400 Received: (Authenticated sender: brice@waegenei.re) by relay7-d.mail.gandi.net (Postfix) with ESMTPSA id 851F820004 for <48980@debbugs.gnu.org>; Sun, 20 Jun 2021 09:32:24 +0000 (UTC) From: Brice Waegeneire Date: Sun, 20 Jun 2021 11:32:21 +0200 Message-Id: <20210620093222.3519-1-brice@waegenei.re> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210612211630.10339-1-brice@waegenei.re> References: <20210612211630.10339-1-brice@waegenei.re> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1624181589; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=34sddf3YooqfAsCWCCnUGzlj9NaAmlA+/36g2XdQ7hM=; b=u5jSbMTObBLohmTqrmhkcBJKBOepFHhiPo0eX0FufSrXOpZrNLMiv2uZuHHuoG0pf2iC6S 3GgveR1V/Egm1af3r/RTqnh3d9FIr7D47CFLKY3jNEEE+n7vDft/dKSxAhooAk8LT86Hh7 5+tBJ5frrrJdDN6Cg9OFHjvAtGEBPo5BKM2cIAJEEQSPOA4ZMyrR7qiNIiOi2bWrh3WlFD uj/xYXeo+wFHH6gB2opVmCwn/NV3swViH8fhHOHZybwXRykX8exlxPfd+uDaMkqnNzHVdn ZKJNQ6rDGsMRXBsmYPOpbZch8M2qNTOK9u2Q+iLPV24gjINzuQqQ0XtpqHV7vw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1624181589; a=rsa-sha256; cv=none; b=r7sJ2elSu925qlUA9JKXO6hwaOwTxH5mlqjrSQ6fqBPBPjaV5zGWfBJ66CaQxwt+3ZNQ34 OoMADPtkIjreWLdphmYtty9IUYZ8MOTocuJp3EXTBP3wmWccPNFHo20WBBgLtGulzST7Xs aA3e5+4hXWNZvebhZ2mOkAaFLK+LaKUv+78TyYYNHy8vKrVZZFubz648nj/NWyx5T0VB35 EM1+bqe7ARNFZ4qSRW9RGGHyMX65lsupoB/Yfgg2YogiT2WacCsU5dv+O+G5rAl/Wudmj3 WZhHvx/lb5g08u7VM9WNyAohBRwzOcfGcr8zl0TT4icimq10PpwP2wmUqxaTLQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -1.43 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: E7966B6C1 X-Spam-Score: -1.43 X-Migadu-Scanner: scn1.migadu.com X-TUID: iFNo52wQYkJb * gnu/packages/gnuzilla.scm (icecat)[inputs]: Add eudev. [phases]: Add eudev to the wrapper. --- gnu/packages/gnuzilla.scm | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) Rebased. diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index a997fc1c73..84feab777e 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2019, 2020 Adrian Malacoda ;;; Copyright © 2020 Jonathan Brielmaier ;;; Copyright © 2020 Marius Bakke +;;; Copyright © 2021 Brice Waegeneire ;;; ;;; 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,24 +1273,21 @@ 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")) - (mit-krb5 (assoc-ref inputs "mit-krb5")) - (mit-krb5-lib (string-append mit-krb5 "/lib"))) + (ld-libs (map (lambda (lib) + (string-append (assoc-ref inputs lib) + "/lib")) + '("libxscrnsaver" + "mesa" + "mit-krb5" + "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 - ,mit-krb5-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