diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-07-22 15:35:46 -0400 |
|---|---|---|
| committer | worldofpeace <worldofpeace@protonmail.ch> | 2019-08-18 04:23:17 -0400 |
| commit | 1728bc8d22ffe5e340dfb7cf3a8627f3638f5616 (patch) | |
| tree | 8bf8c5e13969eb7439934d952ffdae89d065b0de /pkgs/development/libraries/flatpak/fix-paths.patch | |
| parent | 37c22b49f5202a0993b7ef95f23217cacb892955 (diff) | |
| download | nixpkgs-1728bc8d22ffe5e340dfb7cf3a8627f3638f5616.tar nixpkgs-1728bc8d22ffe5e340dfb7cf3a8627f3638f5616.tar.gz nixpkgs-1728bc8d22ffe5e340dfb7cf3a8627f3638f5616.tar.bz2 nixpkgs-1728bc8d22ffe5e340dfb7cf3a8627f3638f5616.tar.lz nixpkgs-1728bc8d22ffe5e340dfb7cf3a8627f3638f5616.tar.xz nixpkgs-1728bc8d22ffe5e340dfb7cf3a8627f3638f5616.tar.zst nixpkgs-1728bc8d22ffe5e340dfb7cf3a8627f3638f5616.zip | |
flatpak: 1.2.4 -> 1.4.2
* Regenerated all patches for 1.4.2 and resolved any conflicts. * fix-test-paths.patch doesn't copy the whole locale archive because we have C.UTF8 now. * nixos/flatpak creates a Flatpak system helper user Change introduced in 1.3.2. Changes: See https://github.com/flatpak/flatpak/releases/tag/1.3.1 through 1.4.2.
Diffstat (limited to 'pkgs/development/libraries/flatpak/fix-paths.patch')
| -rw-r--r-- | pkgs/development/libraries/flatpak/fix-paths.patch | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/libraries/flatpak/fix-paths.patch b/pkgs/development/libraries/flatpak/fix-paths.patch index 49fcaa2b3f9..746b4382864 100644 --- a/pkgs/development/libraries/flatpak/fix-paths.patch +++ b/pkgs/development/libraries/flatpak/fix-paths.patch @@ -1,6 +1,8 @@ +diff --git a/session-helper/flatpak-session-helper.c b/session-helper/flatpak-session-helper.c +index 5dd7629e..ddc71a4c 100644 --- a/session-helper/flatpak-session-helper.c +++ b/session-helper/flatpak-session-helper.c -@@ -624,7 +624,7 @@ +@@ -693,7 +693,7 @@ start_p11_kit_server (const char *flatpak_dir) g_auto(GStrv) stdout_lines = NULL; int i; char *p11_argv[] = { @@ -9,7 +11,7 @@ /* We explicitly request --sh here, because we then fail on earlier versions that doesn't support * this flag. This is good, because those earlier versions did not properly daemonize and caused * the spawn_sync to hang forever, waiting for the pipe to close. -@@ -770,7 +770,7 @@ +@@ -836,7 +836,7 @@ main (int argc, exit (1); } |