diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2023-02-17 01:49:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-17 01:49:48 +0100 |
| commit | 1f9748835ce2b81a8ee14e5caa7c0cca062d9619 (patch) | |
| tree | b8de5aab51a2bdc23e6d701ea8085ad1f0044cfc | |
| parent | e95204260063aa90718a94eaccac3591a5c64469 (diff) | |
| parent | 2dd58d648775b7efb1b5d09ca47fa61a1250a92c (diff) | |
Merge pull request #215958 from Pheoxy/flatpak-1.14.2
flatpak: 1.14.1 → 1.14.2
| -rw-r--r-- | pkgs/development/libraries/flatpak/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/flatpak/unset-env-vars.patch | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index 14e6abd900658..7fd08bc599a6b 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.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 = [ diff --git a/pkgs/development/libraries/flatpak/unset-env-vars.patch b/pkgs/development/libraries/flatpak/unset-env-vars.patch index 6b8017684d453..ffefdd6ed621b 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 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}, }; |