From patchwork Wed Oct 27 04:51:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 34097 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 B20CD27BBE1; Wed, 27 Oct 2021 05:56:03 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C137127BBE4 for ; Wed, 27 Oct 2021 05:56:01 +0100 (BST) Received: from localhost ([::1]:40508 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mfaym-0004Hf-SC for patchwork@mira.cbaines.net; Wed, 27 Oct 2021 00:56:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52628) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mfawz-0001xE-HZ for guix-patches@gnu.org; Wed, 27 Oct 2021 00:54:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36626) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mfawy-0003pQ-TC for guix-patches@gnu.org; Wed, 27 Oct 2021 00:54:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mfawy-0005AI-S0 for guix-patches@gnu.org; Wed, 27 Oct 2021 00:54:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] [PATCH core-update-frozen 17/20] profiles: Add a gdk-pixbuf-loaders-cache-file hook. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Oct 2021 04:54:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51428 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 51428@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 51428-submit@debbugs.gnu.org id=B51428.163531041819678 (code B ref 51428); Wed, 27 Oct 2021 04:54:08 +0000 Received: (at 51428) by debbugs.gnu.org; 27 Oct 2021 04:53:38 +0000 Received: from localhost ([127.0.0.1]:48150 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfawT-00057E-Vv for submit@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:38 -0400 Received: from mail-qk1-f178.google.com ([209.85.222.178]:33639) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfawA-00054J-WF for 51428@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:19 -0400 Received: by mail-qk1-f178.google.com with SMTP id a132so282134qkg.0 for <51428@debbugs.gnu.org>; Tue, 26 Oct 2021 21:53:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=J6kpl8m7pAL17Q+AfNXk/lzscmckgjBZtLjSVUJVWps=; b=hHzw1zInF+iuxt5jzOqgHJWhQ7ztZTk3ZOuurjetf/T1j8yr66s8m9X6TptxKlsz1m vOm2CFggHOKlXjWOJ0jZAygWluaqW/COHRZ9yGF2l+IugSa32MEfORCA7SQ2ms3oFekK eBCal1NyETYIQvepZfbzVU6AXqSpJf5z3tfqJWwym1JNmEMa1qs6+UblzbYUEo0uFur6 3Ip12fSBzY0t2tp1MngqNmhEGnYfIfhETavYJTRsicrTiql4wFNZS0xU1qJS5uSWGA9V 2loqPblIm0TWHdr425uaekj6x1zAC7l3KaPrvNKrtH4it4RO7Dwt+JuTpNvxyAjiDoLK 8kkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=J6kpl8m7pAL17Q+AfNXk/lzscmckgjBZtLjSVUJVWps=; b=J+DTyyhNtZdiiXzMx2y2zSA6mUqTy6XSYJu7P1mDb1b0Ee+feVzi12fNIqayKsVWEf PMpWFF/LJhgnVDM2CyC/avxQQc4hA7gwomw6nW3Pcaj8ts5JUe5S3KZsACm4qxbBvxXg JCHvdW4RbN/vmXABcx1Oo8w29/4GJxkGSjH3fCmaFT9gJjN8QL/j2KFEY6bhZZLq/rzm i28t2Z/utIzyaA4MpGeI+9EB8GvQIoLoEidTCZbqpA6AePfmukCTgEUGpbW0AH31WUIR xHeVSS8Xhehj5taZ5VKTItTXnhKWFwRtwy3vFD7WmwWZmsKyyEXeSKFtOyJftHdZVZPV swFw== X-Gm-Message-State: AOAM531p+2/2xiT18eWguqk6eKm1PtnGhaeu2YDlanjxUvdP9aTyMZR1 d7XPOMEuO1cYK2AHGJQVt3j4ruf6LME= X-Google-Smtp-Source: ABdhPJz5Ei2tPoRhuOpY0PjjmlFN0YH5BI5U+bZul8LudOTAilj8veU75YDSXKU86XB3mcEPFZFhWQ== X-Received: by 2002:a37:6412:: with SMTP id y18mr5757468qkb.293.1635310393319; Tue, 26 Oct 2021 21:53:13 -0700 (PDT) Received: from localhost.localdomain (dsl-10-133-98.b2b2c.ca. [72.10.133.98]) by smtp.gmail.com with ESMTPSA id bk13sm11868197qkb.58.2021.10.26.21.53.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Oct 2021 21:53:12 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 27 Oct 2021 00:51:48 -0400 Message-Id: <20211027045151.9889-17-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211027045151.9889-1-maxim.cournoyer@gmail.com> References: <20211027045151.9889-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches This paves the way toward properly fixing https://issues.guix.gnu.org/50957. * guix/profiles.scm (gdk-pixbuf-loaders-cache-file): Add procedure... (%default-profile-hooks): ... and register it as a profile hook. --- guix/profiles.scm | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/guix/profiles.scm b/guix/profiles.scm index 9494684228..bdc0d52626 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2016, 2018, 2019, 2021 Ricardo Wurmus ;;; Copyright © 2016 Chris Marusich ;;; Copyright © 2017 Huang Ying -;;; Copyright © 2017 Maxim Cournoyer +;;; Copyright © 2017, 2021 Maxim Cournoyer ;;; Copyright © 2019 Kyle Meyer ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2020 Danny Milosavljevic @@ -1161,6 +1161,32 @@ (define build `((type . profile-hook) (hook . emacs-subdirs)))) +(define (gdk-pixbuf-loaders-cache-file manifest) + "Return a derivation that produces a loaders cache file for every gdk-pixbuf +loaders discovered in MANIFEST." + (define gdk-pixbuf ;lazy reference + (module-ref (resolve-interface '(gnu packages gtk)) 'gdk-pixbuf)) + + (mlet %store-monad ((%gdk-pixbuf (manifest-lookup-package + manifest "gdk-pixbuf")) + (gdk-pixbuf-bin -> (file-append gdk-pixbuf "/bin"))) + (define build + (with-imported-modules (source-module-closure + '((guix build glib-or-gtk-build-system))) + #~(begin + (use-modules (guix build glib-or-gtk-build-system)) + (setenv "PATH" (string-append #$gdk-pixbuf-bin ":" (getenv "PATH"))) + (generate-gdk-pixbuf-loaders-cache '#$(manifest-inputs manifest) + (list #$output))))) + (if %gdk-pixbuf + (gexp->derivation "gdk-pixbuf-loaders-cache-file" build + #:local-build? #t + #:substitutable? #f + #:properties + '((type . profile-hook) + (hook . gdk-pixbuf-loaders-cache-file))) + (return #f)))) + (define (glib-schemas manifest) "Return a derivation that unions all schemas from manifest entries and creates the Glib 'gschemas.compiled' file." @@ -1672,6 +1698,7 @@ (define %default-profile-hooks ghc-package-cache-file ca-certificate-bundle emacs-subdirs + gdk-pixbuf-loaders-cache-file glib-schemas gtk-icon-themes gtk-im-modules