diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2022-02-19 10:30:40 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2022-02-22 21:54:38 +0100 |
| commit | 49c6568a8f4de3782b7cb9c5a0af3f758eded1bc (patch) | |
| tree | b8344f1d18986f29a1511f3baf20116860ed8dbb | |
| parent | 97777606991c3a78040c883fa97791ae77073022 (diff) | |
| download | nixpkgs-49c6568a8f4de3782b7cb9c5a0af3f758eded1bc.tar nixpkgs-49c6568a8f4de3782b7cb9c5a0af3f758eded1bc.tar.gz nixpkgs-49c6568a8f4de3782b7cb9c5a0af3f758eded1bc.tar.bz2 nixpkgs-49c6568a8f4de3782b7cb9c5a0af3f758eded1bc.tar.lz nixpkgs-49c6568a8f4de3782b7cb9c5a0af3f758eded1bc.tar.xz nixpkgs-49c6568a8f4de3782b7cb9c5a0af3f758eded1bc.tar.zst nixpkgs-49c6568a8f4de3782b7cb9c5a0af3f758eded1bc.zip | |
flatpak: 1.12.4 → 1.12.6
https://github.com/flatpak/flatpak/releases/tag/1.12.5 https://github.com/flatpak/flatpak/releases/tag/1.12.6
| -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 c97f1effd67..88188f8d0ca 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -53,14 +53,14 @@ stdenv.mkDerivation rec { pname = "flatpak"; - version = "1.12.4"; + version = "1.12.6"; # 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/${version}/${pname}-${version}.tar.xz"; - sha256 = "792e6265f7f6d71b2a087028472a048287bed2587e43d2eec2c31d360c16211c"; # Taken from https://github.com/flatpak/flatpak/releases/ + sha256 = "7wLLUFuRzOUXMJm1SFdo7vGJnrzznt+CfEJUFjqBFic="; # 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 63ce0d12fe0..6b8017684d4 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 8d52d3a5..81700183 100644 +index 146c4f87..bcdad2bc 100644 --- a/common/flatpak-run.c +++ b/common/flatpak-run.c -@@ -1232,6 +1232,7 @@ static const ExportData default_exports[] = { - {"PERLLIB", NULL}, - {"PERL5LIB", NULL}, - {"XCURSOR_PATH", NULL}, +@@ -1710,6 +1710,7 @@ static const ExportData default_exports[] = { + {"GST_PTP_HELPER", NULL}, + {"GST_PTP_HELPER_1_0", NULL}, + {"GST_INSTALL_PLUGINS_HELPER", NULL}, + {"GDK_PIXBUF_MODULE_FILE", NULL}, }; |