public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #116236 from jtojnar/flatpak-spawn-path 

flatpak: attempt to fix flatpak-spawn --clear-env
This commit is contained in:
Jan Tojnar 2021-04-06 22:57:34 +02:00 committed by GitHub
parent 23f5b0961e 1ca880a228
commit 7e98527206
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/flatpak/default.nix
View File

@ -1,5 +1,6 @@
{ lib, stdenv { lib, stdenv
, fetchurl , fetchurl
, fetchpatch
, autoreconfHook , autoreconfHook
, docbook_xml_dtd_45 , docbook_xml_dtd_45
, docbook-xsl-nons , docbook-xsl-nons
@ -93,6 +94,15 @@ stdenv.mkDerivation rec {
# https://github.com/NixOS/nixpkgs/issues/43581 # https://github.com/NixOS/nixpkgs/issues/43581
./use-flatpak-from-path.patch ./use-flatpak-from-path.patch
# Hardcode flatpak binary path for flatpak-spawn.
# When calling the portal’s Spawn command with FLATPAK_SPAWN_FLAGS_CLEAR_ENV flag,
# it will clear environment, including PATH, making the flatpak run fail.
# https://github.com/flatpak/flatpak/pull/4174
(fetchpatch {
url = "https://github.com/flatpak/flatpak/commit/495449daf6d3c072519a36c9e4bc6cc1da4d31db.patch";
sha256 = "gOX/sGupAE7Yg3MVrMhFXzWHpFn+izVyjtkuPzIckuY=";
})
# Nix environment hacks should not leak into the apps. # Nix environment hacks should not leak into the apps.
# https://github.com/NixOS/nixpkgs/issues/53441 # https://github.com/NixOS/nixpkgs/issues/53441
./unset-env-vars.patch ./unset-env-vars.patch