From patchwork Sat Sep 30 19:32:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 54443 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 00E6727BBEC; Sun, 1 Oct 2023 21:27:25 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6835227BBEA for ; Sun, 1 Oct 2023 21:27:25 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qn31c-0007v6-Ov; Sun, 01 Oct 2023 16:26:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qn31b-0007un-GH for guix-patches@gnu.org; Sun, 01 Oct 2023 16:26:47 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qn31b-0004E0-7H for guix-patches@gnu.org; Sun, 01 Oct 2023 16:26:47 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qn31q-00077M-B2 for guix-patches@gnu.org; Sun, 01 Oct 2023 16:27:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66099] [PATCH gnome-team v4 2/4] guix: Add udev-hwdb-bin profile hook. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 01 Oct 2023 20:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66099 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Liliana Marie Prikler , 66099@debbugs.gnu.org Cc: , rg@raghavgururajan.name, maxim.cournoyer@gmail.com Received: via spool by 66099-submit@debbugs.gnu.org id=B66099.169619198227265 (code B ref 66099); Sun, 01 Oct 2023 20:27:02 +0000 Received: (at 66099) by debbugs.gnu.org; 1 Oct 2023 20:26:22 +0000 Received: from localhost ([127.0.0.1]:35462 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qn31B-00075e-SB for submit@debbugs.gnu.org; Sun, 01 Oct 2023 16:26:22 -0400 Received: from planete-kraus.eu ([89.234.140.182]:59580) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qn316-000755-16 for 66099@debbugs.gnu.org; Sun, 01 Oct 2023 16:26:16 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 4bdbcb0d; Sun, 1 Oct 2023 20:25:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:in-reply-to:references:from:date:subject:to:cc :mime-version; s=albinoniB; bh=iWJzn6C1ibGcQLFbUkQ/pnuTVK0=; b=s cqyNlDlrib5oLU4voXxpYg7jJzyDCCLd1xPftd7PRQ08ax5Yof+pgbruto/Rw90g Z69Xtue2XOjr/8CObcw3RFYNsE1c8oBl8lOwVOtle54Mc3b7GiAxxTeaQqclD2OB zxN6wImtOk2ugjgtdr1ZS0LbZtwCu5vchKbe9ALwqUXwe9SqTYpXa80TkzTCSbsg 3xkEyTAQPfZ+EFjpc0E+IHugqLsXrxSAbAHFXxLgzUAR/dfwVfndSlAdkAat+FKG hEae3abxStXGmpH7E2hqeXiWkjZuJ1YP794BHVroox4HnKuDqU7AzBx/Ygr6nqal 4VmRzRm3rHciyinCMBE0A== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 198c55db (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sun, 1 Oct 2023 20:25:57 +0000 (UTC) Message-ID: In-Reply-To: References: Date: Sat, 30 Sep 2023 21:32:59 +0200 MIME-Version: 1.0 User-Agent: Evolution 3.46.4 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: , Reply-to: Vivien Kraus X-ACL-Warn: , Vivien Kraus via Guix-patches X-Patchwork-Original-From: Vivien Kraus via Guix-patches via From: Vivien Kraus Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches The new eudev introduced an index for a hardware database. This index file must be unique. * guix/profiles.scm (udev-hwdb-bin): New profile hook to generate hwdb.bin. (%default-profile-hooks): Register it here. --- guix/profiles.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/guix/profiles.scm b/guix/profiles.scm index c88672c25a..d308e7fb88 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -1905,6 +1905,34 @@ (define (texlive-font-maps manifest) (hook . texlive-font-maps))) (return #f)))) +(define (udev-hwdb-bin manifest) + "Return a derivation that builds lib/udev/hwdb.bin." + (define eudev + (module-ref (resolve-interface '(gnu packages linux)) 'eudev)) + (define build + (with-imported-modules + (source-module-closure '((guix build utils))) + #~(begin + (use-modules (guix build utils)) + (let* ((inputs '#$(manifest-inputs manifest)) + (hwdb-directories + (filter + file-exists? + (map (lambda (directory) + (string-append directory "/lib/udev/hwdb.d")) + inputs)))) + (setenv "UDEV_HWDB_PATH" + (string-join hwdb-directories ":"))) + (invoke #$(file-append eudev "/bin/udevadm") + "hwdb" "--update" + "-o" (string-append #$output "/lib/udev/hwdb.bin"))))) + (gexp->derivation "udev-hwdb-bin" build + #:substitutable? #f + #:local-build? #t + #:properties + `((type . profile-hook) + (hook . udev-hwdb-bin)))) + (define %default-profile-hooks ;; This is the list of derivation-returning procedures that are called by ;; default when making a non-empty profile. @@ -1919,6 +1947,7 @@ (define %default-profile-hooks gtk-icon-themes gtk-im-modules texlive-font-maps + udev-hwdb-bin xdg-desktop-database xdg-mime-database))