[bug#75470,gnome-team,01/59] gnu: gjs: Wrap GI_TYPELIB_PATH to include necessary typelibs.
Message ID | b5465ebee7623584a95b27da0d5aca6d403e9968.1736458798.git.liliana.prikler@gmail.com |
---|---|
State | New |
Headers |
Return-Path: <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org> X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4C60627BBE9; Thu, 9 Jan 2025 22:31:18 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 DE07B27BBE2 for <patchwork@mira.cbaines.net>; Thu, 9 Jan 2025 22:31:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <guix-patches-bounces@gnu.org>) id 1tW12W-0007ry-9R; Thu, 09 Jan 2025 17:30:08 -0500 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 <Debian-debbugs@debbugs.gnu.org>) id 1tW12S-0007pS-Pg for guix-patches@gnu.org; Thu, 09 Jan 2025 17:30:04 -0500 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 <Debian-debbugs@debbugs.gnu.org>) id 1tW12S-0004NP-EC for guix-patches@gnu.org; Thu, 09 Jan 2025 17:30:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:References:In-Reply-To:To:Subject; bh=ijzMHoMz02E2q1wQnlGQMhuFFa82mnlvsUuI0ulElhE=; b=BLTjhdqC4knHE681A6ieG0Ls5dhyU+/LGpikg5bKHPL85ti24LMHv/+7cOVxqnh+0AbzUVEGT8jPGvMlwUxWb6Gq4F0QgyWCNeVJI2Sq+TTsSYVmUxc9L69L75ZyGsYC3Ls15Lb7K1YBYqe4/xk6fsEPQ0Am4R4nDlD37+f8UYRixPIa7kbjwxluUSaeGFA/Lz9IY0/nMEdpas5THqy13nJ1/wm2H/mGFMIRy9gpIX69fepXFfLSVzwfLgk/QxhQh9uUnvbQ+F5CozmI4d6xEs9QbGhr9rTgDYMHpULrxcHhnFRMik7+5h6y7MeDY8hQrbWoaBbYCTvrRaTBSccX2Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1tW12R-0001Rc-Cs; Thu, 09 Jan 2025 17:30:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75470] [PATCH gnome-team 01/59] gnu: gjs: Wrap GI_TYPELIB_PATH to include necessary typelibs. Resent-From: Liliana Marie Prikler <liliana.prikler@gmail.com> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org> Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Thu, 09 Jan 2025 22:30:03 +0000 Resent-Message-ID: <handler.75470.B75470.17364617885360@debbugs.gnu.org> Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75470 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75470@debbugs.gnu.org Cc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu X-Debbugs-Original-Xcc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu Received: via spool by 75470-submit@debbugs.gnu.org id=B75470.17364617885360 (code B ref 75470); Thu, 09 Jan 2025 22:30:03 +0000 Received: (at 75470) by debbugs.gnu.org; 9 Jan 2025 22:29:48 +0000 Received: from localhost ([127.0.0.1]:54829 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1tW12B-0001OA-2U for submit@debbugs.gnu.org; Thu, 09 Jan 2025 17:29:48 -0500 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:50233) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <liliana.prikler@gmail.com>) id 1tW129-0001Ng-6A for 75470@debbugs.gnu.org; Thu, 09 Jan 2025 17:29:45 -0500 Received: by mail-wm1-x342.google.com with SMTP id 5b1f17b1804b1-43690d4605dso11240285e9.0 for <75470@debbugs.gnu.org>; Thu, 09 Jan 2025 14:29:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736461779; x=1737066579; darn=debbugs.gnu.org; h=to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=ijzMHoMz02E2q1wQnlGQMhuFFa82mnlvsUuI0ulElhE=; b=di9JEKipDbqtZs21NxNCIDpQJytv+YKX5hVXoOSOImbmw3/wLFRGA3jUOAexX1J7K1 0dsuk5hhTmpv5S0BGqrM8Ej8TYWSgtos7nl6TZ+mBz4ItUc0VVtmozyVrnt/KaXi0ZGh t2HnKmdtKqMQVJR/llwqfuVHBEK6K6A9fQhA9zy3eHoRNavaaqSd/70elBgKtk/oA/jW 6FE4nVzXqVCY/CiNcMLSHm1EzWcp/0O8fTTxtURBxrhDxPx/5Wp2AApyE6d47EzTqVqj Z0+LFjOEQWq9adwC+4RGdXF5LfgANHs1vFJOB7BSHWnl0ZK6dP4iMzs2dWba0NI/i/UX MB9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736461779; x=1737066579; h=to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ijzMHoMz02E2q1wQnlGQMhuFFa82mnlvsUuI0ulElhE=; b=CmlNwRB+8LtPBmHs9MeG4kXr7BZMEldXSr6SaRoQvcHfvoVwUEmKuiHcPWjN99meFw KKagwBo1p8kUH2AJzmLXOUnr2P2FSfQ+sOyxmi5PpOOpox9VHIXa/4WgnRJChL2dpzrK 7hODlrtT8N99fcqmjadq5evhG6vtTIcZeUe5QGzQClOpRujLTJy8sjD81pv75i48B6XJ KqYXNxoT6SzeD15VPXoirZcPqcV82na7IXezuQKY3DTZTgcPoF/CVCwMzT6dGeC1O6Fq q8SbWbNfbi/3GeMfXHhWdsK/Xs29hRSMxBdhldiyPM6LoalVd9+9BoLAiIcQruEIDHHc pzgw== X-Gm-Message-State: AOJu0YxqnAsFmH2/21czrdCaAWa6d3UJGkaBxlDiJb20wyN1zJ/b+ke6 GomS6CbxGPWPLyHW0w3dUsoQRxivFjHYIVSVVJXPogOo+gN68PPiqEEuJ6AK X-Gm-Gg: ASbGncvqaYDIQ6F/iNIZcHKWhRKnc4LSpSorexLVjElnF2cPUCkwm+/PQ6bjmbJnQK0 x91h3jSbdbQ+iII4+/EHbOc2qNfV3ckvniBRCTVzUSSWzyB6PQuC8vkzyQJdAevWohjkI77RJxC ylCxM/5pUspKuGDT1SV00jXdlzzHPzRT/SYuNd/Ze/zKrV7SwllFLH4Lb6pSXZxc2sBMG0NR50B IenwHHmrCfWUlVufToMJH2cJSK18X4VfnATMNknvLrBptJ/So+PvJtO8ihez2BXl7bI9zE4ibRY 1VUWZFUJlsnRxkeKaZy3CrHRZS9AiBTQ X-Google-Smtp-Source: AGHT+IGCCbAJ9UUhKO0auLxJi6M7x1SOMLlrtKgIydQcnadfj5j8D09vopdyFHEKswaVMMNH4ec55g== X-Received: by 2002:a05:6000:470f:b0:385:f092:e1a with SMTP id ffacd0b85a97d-38a872cb24fmr6441900f8f.11.1736461778945; Thu, 09 Jan 2025 14:29:38 -0800 (PST) Received: from lumine.fritz.box (85-127-114-32.dsl.dynamic.surfer.at. [85.127.114.32]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-436e9dc895esm33120785e9.13.2025.01.09.14.29.38 for <75470@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jan 2025 14:29:38 -0800 (PST) Message-ID: <b5465ebee7623584a95b27da0d5aca6d403e9968.1736458798.git.liliana.prikler@gmail.com> In-Reply-To: <cover.1736458798.git.liliana.prikler@gmail.com> References: <cover.1736458798.git.liliana.prikler@gmail.com> From: Liliana Marie Prikler <liliana.prikler@gmail.com> Date: Thu, 9 Jan 2025 22:38:02 +0100 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: <guix-patches.gnu.org> List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=unsubscribe> List-Archive: <https://lists.gnu.org/archive/html/guix-patches> List-Post: <mailto:guix-patches@gnu.org> List-Help: <mailto:guix-patches-request@gnu.org?subject=help> List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=subscribe> 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 |
Series |
To 46.7 and beyond
|
|
Commit Message
Liliana Marie Prikler
Jan. 9, 2025, 9:38 p.m. UTC
Some packages, like gnome-maps rely on being able to patch the GIRepository search path from inside gjs. For this to work, however, gjs must be able to load GIRepository, needing both glib and gobject-introspection to do so. * gnu/packages/gnome.scm (gjs)[#:phases]: Add ‘wrap-gi’. --- gnu/packages/gnome.scm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index dd61b544d5..134b1b75ac 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7922,7 +7922,20 @@ (define-public gjs (setenv "DISPLAY" ":1") ;; For the missing /etc/machine-id. - (setenv "DBUS_FATAL_WARNINGS" "0")))))) + (setenv "DBUS_FATAL_WARNINGS" "0"))) + (add-after 'install 'wrap-gi + (lambda* (#:key inputs outputs #:allow-other-keys) + (wrap-program (string-append (assoc-ref outputs "out") + "/bin/gjs") + `("GI_TYPELIB_PATH" suffix + (,(dirname + (search-input-file + inputs + "lib/girepository-1.0/GObject-2.0.typelib")) + ,(dirname + (search-input-file + inputs + "lib/girepository-1.0/GIRepository-2.0.typelib")))))))))) (native-inputs (list `(,glib "bin") ;for glib-compile-resources pkg-config