Unverified Commit 1f974883 authored by Jan Tojnar's avatar Jan Tojnar Committed by GitHub
Browse files

Merge pull request #215958 from Pheoxy/flatpak-1.14.2 

flatpak: 1.14.1 → 1.14.2
parents e9520426 2dd58d64

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.1";

  version = "1.14.2";



  # 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-CjyCM0MBjMWJhrbIJUVgnIzb8Pul8B2IMHvRSstd058="; # Taken from https://github.com/flatpak/flatpak/releases/

    sha256 = "sha256-yAcR6s9CqZB49jlqplVV3Wv3PuxjF3a3np17cmK293Q="; # Taken from https://github.com/flatpak/flatpak/releases/

  };



  patches = [

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

+5 −5
Original line number Diff line number Diff line 
diff --git a/common/flatpak-run.c b/common/flatpak-run.c

index 146c4f87..bcdad2bc 100644

index d35b4652..b4bb4a44 100644

--- a/common/flatpak-run.c

+++ b/common/flatpak-run.c

@@ -1710,6 +1710,7 @@ static const ExportData default_exports[] = {

   {"GST_PTP_HELPER", NULL},

   {"GST_PTP_HELPER_1_0", NULL},

   {"GST_INSTALL_PLUGINS_HELPER", NULL},

@@ -1899,6 +1899,7 @@ static const ExportData default_exports[] = {

   {"KRB5CCNAME", NULL},

   {"XKB_CONFIG_ROOT", NULL},

   {"GIO_EXTRA_MODULES", NULL},

+  {"GDK_PIXBUF_MODULE_FILE", NULL},

 };