From patchwork Fri Apr 11 11:36:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rostislav Svoboda X-Patchwork-Id: 41576 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 1C2D527BC4A; Fri, 11 Apr 2025 12:39: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=-7.4 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,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 ED3CF27BC49 for ; Fri, 11 Apr 2025 12:39:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u3CiO-00055l-CA; Fri, 11 Apr 2025 07:38:32 -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 1u3Ci5-00050a-Ob for guix-patches@gnu.org; Fri, 11 Apr 2025 07:38:14 -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 1u3Chu-0008FN-W9 for guix-patches@gnu.org; Fri, 11 Apr 2025 07:38:10 -0400 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:To:Subject; bh=kq9vXEHSPPhYTCVpPpQREM6r+7X/HbH1RK9HsdUndfQ=; b=q8rp8zXn4pPwI+N8Hpu737Gktb6cdnsw87NvFqeXks31FXxNRk5fEAx7Pnlwhak9TMcAovroNSwl9hpY/maIOpdNvEnrTp0FDcz6ZtqqDZab4LCzzGzov/gMCyWCRaVlfh1PXcd8zI6hziDOX+mM6mLy00PaB9yX3nGtInzVJ1fEH9f8NMjieJ8YUkKHkdbe/XZSPlJ5FTVt5EviCbBIyRZ6xGdDgT/dxy0gqtCI/cLRNye9ICO6bDZMo4WX2ahMkMvRpjBljjtz4w+D4oCyHDH2fI+hHXCpdVhcb+x8a5Faxl34MUUaVTt2J5rk/QHzNYKUubNXsAGWCkpbcRnp0g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u3Chu-0006bC-Pj for guix-patches@gnu.org; Fri, 11 Apr 2025 07:38:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77735] [PATCH] gnu: flatpak: Fix "No GSettings schemas are installed on the system". Resent-From: Rostislav Svoboda Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 11 Apr 2025 11:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 77735 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77735@debbugs.gnu.org Cc: Rostislav Svoboda X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.174437145925284 (code B ref -1); Fri, 11 Apr 2025 11:38:02 +0000 Received: (at submit) by debbugs.gnu.org; 11 Apr 2025 11:37:39 +0000 Received: from localhost ([127.0.0.1]:49136 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u3ChW-0006Zj-Eb for submit@debbugs.gnu.org; Fri, 11 Apr 2025 07:37:39 -0400 Received: from lists.gnu.org ([2001:470:142::17]:39834) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u3ChT-0006ZE-12 for submit@debbugs.gnu.org; Fri, 11 Apr 2025 07:37:35 -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 1u3ChM-0004vT-SE for guix-patches@gnu.org; Fri, 11 Apr 2025 07:37:28 -0400 Received: from mail-ej1-x632.google.com ([2a00:1450:4864:20::632]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u3ChF-000896-8r for guix-patches@gnu.org; Fri, 11 Apr 2025 07:37:28 -0400 Received: by mail-ej1-x632.google.com with SMTP id a640c23a62f3a-ac34257295dso365016866b.2 for ; Fri, 11 Apr 2025 04:37:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744371438; x=1744976238; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=kq9vXEHSPPhYTCVpPpQREM6r+7X/HbH1RK9HsdUndfQ=; b=b39aj0Wtz/AkCqS9s3rA7lsCpPAT35iYjgbeQyjFVaeArxw+GZSvIF9f+3kHgICAcU brxhIyn0oEbB8cIzL7uiHc+CQkDzuT2hsz869E4s5QFIRJsojIE8VzoYaQU2LbYL49eV 5M74hlocNXKJuCHAWsHl3SbV+3ayhV3aRhLdpi3tYaM3sg9q1gAb46vEaGbHqbPu6xMi RWEcUYFvyT8z2AGbAZzKP0P9Mu4Zyngg5nWxr374WUCPKa6jP5qMxVpjJv8GYSbes2ch KOBW45O3Ca1zC9L5ZPHr9vM9tgnBFeAj4mtXDdTPU/dG/5Bt/WL8UWUE3qEBbcZ0Sq/E qykw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744371438; x=1744976238; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=kq9vXEHSPPhYTCVpPpQREM6r+7X/HbH1RK9HsdUndfQ=; b=WTRuIDbsykkCvtdT+eDVo6NcANtsaWh/lnWzlyBGSMdfdd2jxCZQs/mR9J0m8ebe8S C3k5V9kVO0lJwTWFCO+k4KULZcYvz3+rmm/RUIf99R4sUYf9Verb93B1V3LNF/kDcoEJ iTjHwDbahqXr7gP1DKZ8Qk6jM+EwSvSeG6v2UgDZR+qqC5EIRQNRpXIsUUA7dMHUT4dt 64wA1DsbPGdNdmG2F/GjQuimFGF7yQwfxmVuGO2Ya16DwNwGXO6Cke1Dl1MfFR4Woaeq IOEGYaxHOBvQdIhualAhM3hxr3IHb6CnS3wp4tFx8wJkiX4oXb19jUCbdJX4oqcBXEdJ GgLA== X-Gm-Message-State: AOJu0YxSftYl0Fglm0GsMYdo3kwIBqvIEgkDEF/ejhy770+47i2FMvRX /znoZh6NvoTR9f0ToA6PHE1qI9m+i/c39WtKFyqGIi3Hw2hADfJXHqZMng== X-Gm-Gg: ASbGncuEGeswCCcrZJSD8u/MQJ60t8U3HfyqBlWiUixbXY76/EKuL1g/nrgA1LCydZJ zTaigtnJdp7WpCkGmA6lc0A3nzjM2+jqgCmVZ8RiP3C+zm8BvOl/9eYr5YXt1Cr8BrSfDdRW8dR UfmLASp6Eeyh1Bp3jW37Ikyi4ifMI2fS/MJBQoMdlb+69p3SGtt5SM4Dg/2FehDHfd+e3uwpXB/ 70boexFDitN/F8c/jWjMrcqD01nWX3T4w+5FRBcFZGuTuzVebaXmKjOGtOTM1teOt6H58kMJIk8 tRO4DFhPS2NA2OIR0WS+Zouq3b+4ZmYqlMCe4Vdpi/h9So6WcG1xpj94iX4IVe1vrMQE6OmloZR /AiO++2BeJMHJ5llh7Va/YCBiGlDnfrlcM/OQby11scfDMPjaHsge+WPH4d9fufDrB3B1vXcIGc 8vEw== X-Google-Smtp-Source: AGHT+IHv9t7qbHafUF8AWKkdg/nl6hXPOCGsG+KBVNjkA0m6BtO91Aqb68G1Vj+e67ce+NAwuf+VKA== X-Received: by 2002:a17:907:96ab:b0:ac2:88df:6a5b with SMTP id a640c23a62f3a-acad36a589amr177584066b.42.1744371437534; Fri, 11 Apr 2025 04:37:17 -0700 (PDT) Received: from ecke.fritz.box (dynamic-2a02-3100-65ac-9c00-0cd6-f14f-6c37-b78b.310.pool.telefonica.de. [2a02:3100:65ac:9c00:cd6:f14f:6c37:b78b]) by smtp.googlemail.com with ESMTPSA id a640c23a62f3a-acaa1ce6fd9sm424211566b.161.2025.04.11.04.37.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Apr 2025 04:37:16 -0700 (PDT) From: Rostislav Svoboda X-Google-Original-From: Rostislav Svoboda Date: Fri, 11 Apr 2025 13:36:51 +0200 Message-ID: X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::632; envelope-from=rostislav.svoboda@gmail.com; helo=mail-ej1-x632.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/package-management.scm (flatpak)[inputs]: Add gsettings-desktop-schemas. <#:phases>: Set GSETTINGS_SCHEMA_DIR in wrap-phase. This fixes an error that appeared when running system-wide Flatpak operations such as 'sudo flatpak update': GLib-GIO-ERROR [...] No GSettings schemas are installed on the system The missing schemas from gsettings-desktop-schemas prevented proper GLib configuration lookups (e.g., org.gnome.system.proxy). By setting GSETTINGS_SCHEMA_DIR to point to gsettings-desktop-schemas' schema directory, we ensure Flatpak can access required GLib configuration templates. Change-Id: I9522c07b6c8ccf20a86ee966effb73eb61a2abc7 --- gnu/packages/package-management.scm | 261 ++++++++++++++-------------- 1 file changed, 135 insertions(+), 126 deletions(-) base-commit: 772b70455d0d5972fdad80d8529647dce20f409a diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 81dcf24857..798930588b 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -2040,135 +2040,144 @@ (define-public libostree (license license:lgpl2.0+))) (define-public flatpak - (package - (name "flatpak") - (version "1.16.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/flatpak/flatpak/releases/download/" - version "/flatpak-" version ".tar.xz")) - (sha256 - (base32 "0ajbz8ms4h5nyjr59hv9z8vaimj4f3p51v8idmy14qnbmmjwa2nb")) - (patches - (search-patches "flatpak-fix-fonts-icons.patch" - "flatpak-fix-path.patch" - "flatpak-fix-icon-validation.patch" - "flatpak-unset-gdk-pixbuf-for-sandbox.patch")))) - (build-system meson-build-system) - (arguments - (list - #:configure-flags - #~(list - "-Dsystem_helper=disabled" - "-Dlocalstatedir=/var" - (string-append "-Dsystem_bubblewrap=" - (assoc-ref %build-inputs "bubblewrap") - "/bin/bwrap") - (string-append "-Dsystem_dbus_proxy=" - (assoc-ref %build-inputs "xdg-dbus-proxy") - "/bin/xdg-dbus-proxy")) - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'disable-failing-tests - (lambda _ - (substitute* "tests/test-matrix/meson.build" - ;; The following tests fail with error message related to fusermount3 - ;; failing an unmount operation ("No such file or directory"). - (("^.*test-http-utils.*$") "") - (("^.*test-summaries@system.wrap.*$") "") - (("^.*test-prune.*$") "")))) - (add-after 'unpack 'fix-tests - (lambda* (#:key inputs #:allow-other-keys) - (copy-recursively - (search-input-directory inputs "lib/locale") - "/tmp/locale") - (for-each make-file-writable (find-files "/tmp")) - (substitute* "tests/make-test-runtime.sh" - (("cp `which.*") "echo guix\n") - (("cp -r /usr/lib/locale/C\\.\\*") - (string-append "mkdir ${DIR}/usr/lib/locale/en_US; \ + (let ((release "1.16.0") + (revision "1")) + (package + (name "flatpak") + (version (string-append release "-" revision)) + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/flatpak/flatpak/releases/download/" + release "/flatpak-" release ".tar.xz")) + (sha256 + (base32 "0ajbz8ms4h5nyjr59hv9z8vaimj4f3p51v8idmy14qnbmmjwa2nb")) + (patches + (search-patches "flatpak-fix-fonts-icons.patch" + "flatpak-fix-path.patch" + "flatpak-fix-icon-validation.patch" + "flatpak-unset-gdk-pixbuf-for-sandbox.patch")))) + (build-system meson-build-system) + (arguments + (list + #:configure-flags + #~(list + "-Dsystem_helper=disabled" + "-Dlocalstatedir=/var" + (string-append "-Dsystem_bubblewrap=" + (assoc-ref %build-inputs "bubblewrap") + "/bin/bwrap") + (string-append "-Dsystem_dbus_proxy=" + (assoc-ref %build-inputs "xdg-dbus-proxy") + "/bin/xdg-dbus-proxy")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'disable-failing-tests + (lambda _ + (substitute* "tests/test-matrix/meson.build" + ;; The following tests fail with error message related to fusermount3 + ;; failing an unmount operation ("No such file or directory"). + (("^.*test-http-utils.*$") "") + (("^.*test-summaries@system.wrap.*$") "") + (("^.*test-prune.*$") "")))) + (add-after 'unpack 'fix-tests + (lambda* (#:key inputs #:allow-other-keys) + (copy-recursively + (search-input-directory inputs "lib/locale") + "/tmp/locale") + (for-each make-file-writable (find-files "/tmp")) + (substitute* "tests/make-test-runtime.sh" + (("cp `which.*") "echo guix\n") + (("cp -r /usr/lib/locale/C\\.\\*") + (string-append "mkdir ${DIR}/usr/lib/locale/en_US; \ cp -r /tmp/locale/*/en_US.*"))) - (substitute* "tests/libtest.sh" - (("/bin/kill") (which "kill")) - (("/usr/bin/python3") (which "python3"))) - #t)) - (add-after 'unpack 'p11-kit-fix - (lambda* (#:key inputs #:allow-other-keys) - (let ((p11-path (search-input-file inputs "/bin/p11-kit"))) - (substitute* "session-helper/flatpak-session-helper.c" - (("\"p11-kit\",") - (string-append "\"" p11-path "\",")) - (("if \\(g_find_program_in_path \\(\"p11-kit\"\\)\\)") - (string-append "if (g_find_program_in_path (\"" - p11-path "\"))")))))) - (add-after 'unpack 'fix-icon-validation - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (store (dirname out))) - (substitute* "icon-validator/validate-icon.c" - (("@storeDir@") store))))) - (add-before 'check 'pre-check - (lambda _ - ;; Set $HOME to writable location for testcommon tests. - (setenv "HOME" "/tmp"))) - (add-after 'install 'wrap-flatpak - (lambda* (#:key inputs #:allow-other-keys) - (let ((flatpak (string-append #$output "/bin/flatpak")) - (glib-networking (assoc-ref inputs "glib-networking"))) - (wrap-program flatpak - ;; Allow GIO to find TLS backend. - `("GIO_EXTRA_MODULES" prefix - (,(string-append glib-networking "/lib/gio/modules")))))))))) - (native-inputs - (list bison - dbus ; for dbus-daemon - gettext-minimal - `(,glib "bin") ; for glib-mkenums + gdbus-codegen - gtk-doc - (libc-utf8-locales-for-target) - gobject-introspection - libcap - pkg-config - python - python-pyparsing - socat - which)) - (inputs - (list appstream - appstream-glib - bash-minimal - bubblewrap - curl - fuse - gdk-pixbuf - libcap - libostree - libsoup-minimal-2 - libxml2 - p11-kit - polkit - util-linux - xdg-dbus-proxy - zstd)) - (propagated-inputs (list glib-networking - gnupg - gsettings-desktop-schemas - ;; The following are listed in Requires.private of - ;; `flatpak.pc'. - curl - dconf - gpgme - json-glib - libarchive - libseccomp - libxau)) - (home-page "https://flatpak.org") - (synopsis "System for building, distributing, and running sandboxed desktop + (substitute* "tests/libtest.sh" + (("/bin/kill") (which "kill")) + (("/usr/bin/python3") (which "python3"))) + #t)) + (add-after 'unpack 'p11-kit-fix + (lambda* (#:key inputs #:allow-other-keys) + (let ((p11-path (search-input-file inputs "/bin/p11-kit"))) + (substitute* "session-helper/flatpak-session-helper.c" + (("\"p11-kit\",") + (string-append "\"" p11-path "\",")) + (("if \\(g_find_program_in_path \\(\"p11-kit\"\\)\\)") + (string-append "if (g_find_program_in_path (\"" + p11-path "\"))")))))) + (add-after 'unpack 'fix-icon-validation + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (store (dirname out))) + (substitute* "icon-validator/validate-icon.c" + (("@storeDir@") store))))) + (add-before 'check 'pre-check + (lambda _ + ;; Set $HOME to writable location for testcommon tests. + (setenv "HOME" "/tmp"))) + (add-after 'install 'wrap-flatpak + (lambda* (#:key inputs #:allow-other-keys) + (let ((flatpak (string-append #$output "/bin/flatpak")) + (glib-networking (assoc-ref inputs "glib-networking"))) + (wrap-program flatpak + ;; Prevent error: + ;; "No GSettings schemas are installed on the system" + `("GSETTINGS_SCHEMA_DIR" = + (, (string-append + #$(this-package-input "gsettings-desktop-schemas") + "/share/glib-2.0/schemas"))) + ;; Allow GIO to find TLS backend. + `("GIO_EXTRA_MODULES" prefix + (,(string-append glib-networking "/lib/gio/modules")))))))))) + (native-inputs + (list bison + dbus ; for dbus-daemon + gettext-minimal + `(,glib "bin") ; for glib-mkenums + gdbus-codegen + gtk-doc + (libc-utf8-locales-for-target) + gobject-introspection + libcap + pkg-config + python + python-pyparsing + socat + which)) + (inputs + (list appstream + appstream-glib + bash-minimal + bubblewrap + curl + fuse + gsettings-desktop-schemas + gdk-pixbuf + libcap + libostree + libsoup-minimal-2 + libxml2 + p11-kit + polkit + util-linux + xdg-dbus-proxy + zstd)) + (propagated-inputs (list glib-networking + gnupg + gsettings-desktop-schemas + ;; The following are listed in Requires.private of + ;; `flatpak.pc'. + curl + dconf + gpgme + json-glib + libarchive + libseccomp + libxau)) + (home-page "https://flatpak.org") + (synopsis "System for building, distributing, and running sandboxed desktop applications") - (description "Flatpak is a system for building, distributing, and running + (description "Flatpak is a system for building, distributing, and running sandboxed desktop applications on GNU/Linux.") - (license license:lgpl2.1+))) + (license license:lgpl2.1+)))) (define-public fpm (package