From db9b566c4f5d6380de458930f48a68e2881683b6 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Sun, 9 Apr 2023 13:02:20 -0400
Subject: [PATCH] flatpak: 1.14.2 -> 1.14.4

this release fixes two CVEs (CVE-2023-28101 and CVE-2023-28100), as well
as bringing in bug fixes from 1.14.3.
---
 pkgs/development/libraries/flatpak/default.nix          | 4 ++--
 pkgs/development/libraries/flatpak/unset-env-vars.patch | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix
index 7fd08bc599a6..42628239b988 100644
--- a/pkgs/development/libraries/flatpak/default.nix
+++ b/pkgs/development/libraries/flatpak/default.nix
@@ -54,14 +54,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "flatpak";
-  version = "1.14.2";
+  version = "1.14.4";
 
   # 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/${finalAttrs.version}/flatpak-${finalAttrs.version}.tar.xz";
-    sha256 = "sha256-yAcR6s9CqZB49jlqplVV3Wv3PuxjF3a3np17cmK293Q="; # Taken from https://github.com/flatpak/flatpak/releases/
+    sha256 = "sha256-ijTb0LZ8Q051mLmOxpCVPQRvDbJuSArq+0bXKuxxZ5k="; # Taken from https://github.com/flatpak/flatpak/releases/
   };
 
   patches = [
diff --git a/pkgs/development/libraries/flatpak/unset-env-vars.patch b/pkgs/development/libraries/flatpak/unset-env-vars.patch
index ffefdd6ed621..fec0573ed950 100644
--- a/pkgs/development/libraries/flatpak/unset-env-vars.patch
+++ b/pkgs/development/libraries/flatpak/unset-env-vars.patch
@@ -1,11 +1,11 @@
 diff --git a/common/flatpak-run.c b/common/flatpak-run.c
-index d35b4652..b4bb4a44 100644
+index 8fa8c0e0..e1cdeba0 100644
 --- a/common/flatpak-run.c
 +++ b/common/flatpak-run.c
-@@ -1899,6 +1899,7 @@ static const ExportData default_exports[] = {
-   {"KRB5CCNAME", NULL},
+@@ -1900,6 +1900,7 @@ static const ExportData default_exports[] = {
    {"XKB_CONFIG_ROOT", NULL},
    {"GIO_EXTRA_MODULES", NULL},
+   {"GDK_BACKEND", NULL},
 +  {"GDK_PIXBUF_MODULE_FILE", NULL},
  };