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

Merge pull request #322485 from getchoo/pkgs/flatpak/1.14.8 

flatpak: 1.14.6 -> 1.14.8
parents a950d868 81bce575

pkgs/by-name/fl/flatpak/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "flatpak";

  version = "1.14.6";

  version = "1.14.8";



  # TODO: split out lib once we figure out what to do with triggerdir

  outputs = [
@@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { 


  src = fetchurl {

    url = "https://github.com/flatpak/flatpak/releases/download/${finalAttrs.version}/flatpak-${finalAttrs.version}.tar.xz";

    hash = "sha256-U482ssb4xw7v0S0TrVsa2DCCAQaovTqfa45NnegeSUY=";

    hash = "sha256-EBa3Mn96+HiW+VRl9+WBN1DTtwSaN0ChpN3LX6jFNI4=";

  };



  patches = [

pkgs/by-name/fl/flatpak/unset-env-vars.patch

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

index 6f54a9d0..102d9b90 100644

index e3f031d4..ed131c0b 100644

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

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

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

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

   {"XKB_CONFIG_ROOT", NULL},

   {"GIO_EXTRA_MODULES", NULL},

   {"GDK_BACKEND", NULL},

   {"VK_DRIVER_FILES", NULL},

   {"VK_ICD_FILENAMES", NULL},

+  {"GDK_PIXBUF_MODULE_FILE", NULL},

 };

 

 static const ExportData no_ld_so_cache_exports[] = {
 
   {"VK_ADD_DRIVER_FILES", NULL},

   {"VK_ADD_LAYER_PATH", NULL},

   {"VK_DRIVER_FILES", NULL},