From 31c95c1f79a48d2834bebdd1fd5b02ece609fb9e Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 1 Feb 2021 21:53:32 +0100
Subject: [PATCH] =?UTF-8?q?flatpak:=201.8.2=20=E2=86=92=201.10.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Changes:
- https://github.com/flatpak/flatpak/releases/tag/1.9.1
- https://github.com/flatpak/flatpak/releases/tag/1.9.2
- https://github.com/flatpak/flatpak/releases/tag/1.8.4
- https://github.com/flatpak/flatpak/releases/tag/1.9.3
- https://github.com/flatpak/flatpak/releases/tag/1.8.5
- https://github.com/flatpak/flatpak/releases/tag/1.10.0
- https://github.com/flatpak/flatpak/releases/tag/1.10.1

Security advisories:
- https://github.com/flatpak/flatpak/security/advisories/GHSA-4ppf-fxf6-vxg2

Also:
- Clarify license.
- Re-enable zstd compression (seems to be fixed now).
- Stop introducing GTK to scope through wrapGAppsHook.
- Clean up the DTDs and build tools we managed to fix upstream.
---
 .../development/libraries/flatpak/default.nix | 47 +++++--------------
 1 file changed, 12 insertions(+), 35 deletions(-)

diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix
index 1480f42750d..36c946e06f7 100644
--- a/pkgs/development/libraries/flatpak/default.nix
+++ b/pkgs/development/libraries/flatpak/default.nix
@@ -1,12 +1,8 @@
 { lib, stdenv
 , fetchurl
-, fetchpatch
-, autoconf
-, automake
-, libtool
+, autoreconfHook
 , docbook_xml_dtd_412
-, docbook_xml_dtd_42
-, docbook_xml_dtd_43
+, docbook_xml_dtd_45
 , docbook-xsl-nons
 , which
 , libxml2
@@ -49,7 +45,7 @@
 , xorg
 , valgrind
 , glib-networking
-, wrapGAppsHook
+, wrapGAppsNoGuiHook
 , dconf
 , gsettings-desktop-schemas
 , librsvg
@@ -57,14 +53,14 @@
 
 stdenv.mkDerivation rec {
   pname = "flatpak";
-  version = "1.8.2";
+  version = "1.10.1";
 
   # TODO: split out lib once we figure out what to do with triggerdir
   outputs = [ "out" "dev" "man" "doc" "devdoc" "installedTests" ];
 
   src = fetchurl {
     url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz";
-    sha256 = "eSZiXffCKCpe4aizwxevU9QKZjsbxrGKLch0fiZQhbA=";
+    sha256 = "1dywvfpmszvp2wy5hvpzy8z6gz2gzmi9p302njp52p9vpx14ydf1";
   };
 
   patches = [
@@ -104,24 +100,15 @@ stdenv.mkDerivation rec {
 
     # But we want the GDK_PIXBUF_MODULE_FILE from the wrapper affect the icon validator.
     ./validate-icon-pixbuf.patch
-
-    # Fix `flatpak/test-oci-registry@{user,system}.wrap.test` installed tests.
-    # https://github.com/flatpak/flatpak/pull/3762
-    (fetchpatch {
-      url = "https://github.com/flatpak/flatpak/commit/c1447dadecd50f384b6d11dac18b014245267d00.patch";
-      sha256 = "UAA/wGr8/aMbx5MV+8Ilro2kgKkx2QOn88lDUjCgeDA=";
-    })
   ];
 
   nativeBuildInputs = [
-    autoconf
-    automake
-    libtool
+    autoreconfHook
     libxml2
-    # TODO: replace with docbook_xml_dtd_45 https://github.com/flatpak/flatpak/pull/3760
+    # Remove 4.1.2 again once the following is merged
+    # https://github.com/flatpak/flatpak/pull/4102
     docbook_xml_dtd_412
-    docbook_xml_dtd_42
-    docbook_xml_dtd_43
+    docbook_xml_dtd_45
     docbook-xsl-nons
     which
     gobject-introspection
@@ -132,7 +119,7 @@ stdenv.mkDerivation rec {
     xmlto
     appstream-glib
     yacc
-    wrapGAppsHook
+    wrapGAppsNoGuiHook
   ];
 
   buildInputs = [
@@ -147,7 +134,7 @@ stdenv.mkDerivation rec {
     libseccomp
     libsoup
     lzma
-    # zstd # TODO: broken paths in .pc file
+    zstd
     polkit
     python3
     systemd
@@ -199,16 +186,6 @@ stdenv.mkDerivation rec {
     PATH=${lib.makeBinPath [vsc-py]}:$PATH patchShebangs --build variant-schema-compiler/variant-schema-compiler
   '';
 
-  preConfigure = ''
-    # TODO: remove the condition once autogen.sh is shipped in the tarball
-    # https://github.com/flatpak/flatpak/pull/3761
-    if [[ -f autogen.sh ]]; then
-        NOCONFIGURE=1 ./autogen.sh
-    else
-        autoreconf --install --force --verbose
-    fi
-  '';
-
   passthru = {
     tests = {
       installedTests = nixosTests.installed-tests.flatpak;
@@ -218,7 +195,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Linux application sandboxing and distribution framework";
     homepage = "https://flatpak.org/";
-    license = licenses.lgpl21;
+    license = licenses.lgpl21Plus;
     maintainers = with maintainers; [ jtojnar ];
     platforms = platforms.linux;
   };