[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/14: gnu: flatpak: Use glib-or-gtk-build-system.
From: |
guix-commits |
Subject: |
01/14: gnu: flatpak: Use glib-or-gtk-build-system. |
Date: |
Sun, 24 Mar 2019 18:10:20 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 16360cc884030eb69590dc18d9694b04c67273f6
Author: Ludovic Courtès <address@hidden>
Date: Sun Mar 24 22:26:50 2019 +0100
gnu: flatpak: Use glib-or-gtk-build-system.
This wraps 'flatpak' such that GIO_EXTRA_MODULES is set, thereby
allowing GIO (part of GLib) to find the GnuTLS-based TLS backend that
glib-networking provides.
Fixes <https://bugs.gnu.org/34861>.
Reported by Raghav Gururajan <address@hidden>.
* gnu/packages/package-management.scm (flatpak)[build-system]: Change to
GLIB-OR-GTK-BUILD-SYSTEM.
---
gnu/packages/package-management.scm | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/package-management.scm
b/gnu/packages/package-management.scm
index 86e8fce..0b70ae4 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -78,6 +78,7 @@
#:use-module (gnu packages web)
#:use-module (gnu packages xml)
#:use-module (gnu packages xorg)
+ #:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system gnu)
#:use-module (guix build-system meson)
#:use-module (guix build-system python)
@@ -1018,7 +1019,11 @@ the bootloader configuration.")
(sha256
(base32
"0i0dn3w3545lvmjlzqj3j70lk8yrq64r9frp1rk6a161gwq20ixv"))))
- (build-system gnu-build-system)
+
+ ;; Wrap 'flatpak' so that GIO_EXTRA_MODULES is set, thereby allowing GIO to
+ ;; find the TLS backend in glib-networking.
+ (build-system glib-or-gtk-build-system)
+
(arguments
'(#:tests? #f ;; Tests fail due to trying to create files where it can't.
#:configure-flags (list
- branch master updated (37f6289 -> fab9aa1), guix-commits, 2019/03/24
- 01/14: gnu: flatpak: Use glib-or-gtk-build-system.,
guix-commits <=
- 03/14: bootloader: Reindent record type definition., guix-commits, 2019/03/24
- 02/14: bootloader: Remove unused 'additional-configuration' field., guix-commits, 2019/03/24
- 06/14: services: xorg: Remove unused #:guile parameter., guix-commits, 2019/03/24
- 05/14: bootloader: Add a 'keyboard-layout' field., guix-commits, 2019/03/24
- 04/14: Add (gnu system keyboard)., guix-commits, 2019/03/24
- 10/14: vm: 'virtualized-operating-system' inherits from the user's bootloader config., guix-commits, 2019/03/24
- 09/14: services: xorg: Add a 'keyboard-layout' field in <xorg-configuration>., guix-commits, 2019/03/24
- 11/14: gnu: Add loadkeys-static., guix-commits, 2019/03/24
- 08/14: services: sddm, slim, gdm: Take an <xorg-configuration> record., guix-commits, 2019/03/24
- 14/14: gnu: Add xfce4-whiskermenu-plugin., guix-commits, 2019/03/24