Unverified Commit 86c01cce authored by Jan Tojnar's avatar Jan Tojnar Committed by GitHub
Browse files

Merge pull request #225487 from getchoo/flatpak-1.14.4 

flatpak: 1.14.2 -> 1.14.4
parents 1ec2917c db9b566c

pkgs/development/libraries/flatpak/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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 = [

pkgs/development/libraries/flatpak/unset-env-vars.patch

+3 −3
Original line number Diff line number Diff line 
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},

 };