diff options
| author | Daniel Hancock <dhancock@camelot.network> | 2023-02-12 17:35:02 +0800 |
|---|---|---|
| committer | Daniel Hancock <dhancock@camelot.network> | 2023-02-12 18:16:08 +0800 |
| commit | 2dd58d648775b7efb1b5d09ca47fa61a1250a92c (patch) | |
| tree | 95bf8caa69c062d1c91500bc3e5ff4b77f1a719a | |
| parent | d1cd9f140292aa8cdd77433a793e173731101473 (diff) | |
| download | nixpkgs-2dd58d648775b7efb1b5d09ca47fa61a1250a92c.tar nixpkgs-2dd58d648775b7efb1b5d09ca47fa61a1250a92c.tar.gz nixpkgs-2dd58d648775b7efb1b5d09ca47fa61a1250a92c.tar.bz2 nixpkgs-2dd58d648775b7efb1b5d09ca47fa61a1250a92c.tar.lz nixpkgs-2dd58d648775b7efb1b5d09ca47fa61a1250a92c.tar.xz nixpkgs-2dd58d648775b7efb1b5d09ca47fa61a1250a92c.tar.zst nixpkgs-2dd58d648775b7efb1b5d09ca47fa61a1250a92c.zip | |
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 14e6abd9006..7fd08bc599a 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 6b8017684d4..ffefdd6ed62 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}, }; |