alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #225487 from getchoo/flatpak-1.14.4

Browse source 
flatpak: 1.14.2 -> 1.14.4
This commit is contained in:
Jan Tojnar 2023-04-10 10:58:42 +02:00 committed by GitHub
parent 1ec2917c02 db9b566c4f
commit 86c01cce8b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/libraries/flatpak/default.nix
View file

@ -54,14 +54,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "flatpak";
version = "1.14.2";
version = "1.14.4";
# 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-yAcR6s9CqZB49jlqplVV3Wv3PuxjF3a3np17cmK293Q="; # Taken from https://github.com/flatpak/flatpak/releases/
sha256 = "sha256-ijTb0LZ8Q051mLmOxpCVPQRvDbJuSArq+0bXKuxxZ5k="; # Taken from https://github.com/flatpak/flatpak/releases/
};
patches = [

6
pkgs/development/libraries/flatpak/unset-env-vars.patch
View file

@ -1,11 +1,11 @@
diff --git a/common/flatpak-run.c b/common/flatpak-run.c
index d35b4652..b4bb4a44 100644
index 8fa8c0e0..e1cdeba0 100644
--- a/common/flatpak-run.c
+++ b/common/flatpak-run.c
@@ -1899,6 +1899,7 @@ static const ExportData default_exports[] = {
{"KRB5CCNAME", NULL},
@@ -1900,6 +1900,7 @@ static const ExportData default_exports[] = {
{"XKB_CONFIG_ROOT", NULL},
{"GIO_EXTRA_MODULES", NULL},
{"GDK_BACKEND", NULL},
+ {"GDK_PIXBUF_MODULE_FILE", NULL},
};