From 0d79b83869f112725464de0d00ca00befdf770c0 Mon Sep 17 00:00:00 2001 From: Mathieu Bridon Date: Fri, 20 Jul 2018 16:58:16 +0200 Subject: flatpak: Fix the libgee build org.gnome.Sdk//master is based on the future org.freedesktop.Sdk, which includes pkgconf as a replacement for pkg-config. Unfortunately, pkgconf doesn't seem to respect env vars the way pkg-config did: https://git.dereferenced.org/pkgconf/pkgconf/issues/2 This commit fixes the nightly build, which was failing: http://sdkbuilder.gnome.org/logs/build-2018-07-19-082003/build-gnome-apps-nightly-master-org.gnome.Contacts-x86_64.txt --- data/flatpak/org.gnome.Contacts.json | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/data/flatpak/org.gnome.Contacts.json b/data/flatpak/org.gnome.Contacts.json index 56f255e..c84aba5 100644 --- a/data/flatpak/org.gnome.Contacts.json +++ b/data/flatpak/org.gnome.Contacts.json @@ -63,12 +63,10 @@ }, { "name": "libgee", - "build-options" : { - "env": { - "PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR": "/app/share/gir-1.0", - "PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR": "/app/lib/girepository-1.0" - } - }, + "make-install-args": [ + "girdir=/app/share/gir-1.0", + "typelibdir=/app/lib/girepository-1.0" + ], "sources": [ { "type": "git", -- cgit v1.2.1