diff options
| author | Tor Hedin Brønner <torhedinbronner@gmail.com> | 2018-09-06 11:38:09 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-09-14 05:09:01 +0200 |
| commit | 37a828ec27e94f6e08c5a617ae62cce84ef49b83 (patch) | |
| tree | 71c177061e080eb837d5f7e6d217e4dade6c99af /pkgs/development/libraries/flatpak/fix-paths.patch | |
| parent | 2d19ee62473403de5e7d6e26c9a520b8fe3a89e9 (diff) | |
| download | nixpkgs-37a828ec27e94f6e08c5a617ae62cce84ef49b83.tar nixpkgs-37a828ec27e94f6e08c5a617ae62cce84ef49b83.tar.gz nixpkgs-37a828ec27e94f6e08c5a617ae62cce84ef49b83.tar.bz2 nixpkgs-37a828ec27e94f6e08c5a617ae62cce84ef49b83.tar.lz nixpkgs-37a828ec27e94f6e08c5a617ae62cce84ef49b83.tar.xz nixpkgs-37a828ec27e94f6e08c5a617ae62cce84ef49b83.tar.zst nixpkgs-37a828ec27e94f6e08c5a617ae62cce84ef49b83.zip | |
flatpak: 0.99.3 -> 1.0.2
Diffstat (limited to 'pkgs/development/libraries/flatpak/fix-paths.patch')
| -rw-r--r-- | pkgs/development/libraries/flatpak/fix-paths.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/pkgs/development/libraries/flatpak/fix-paths.patch b/pkgs/development/libraries/flatpak/fix-paths.patch new file mode 100644 index 00000000000..49fcaa2b3f9 --- /dev/null +++ b/pkgs/development/libraries/flatpak/fix-paths.patch @@ -0,0 +1,20 @@ +--- a/session-helper/flatpak-session-helper.c ++++ b/session-helper/flatpak-session-helper.c +@@ -624,7 +624,7 @@ + g_auto(GStrv) stdout_lines = NULL; + int i; + char *p11_argv[] = { +- "p11-kit", "server", ++ "@p11@/bin/p11-kit", "server", + /* 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 @@ + exit (1); + } + +- if (g_find_program_in_path ("p11-kit")) ++ if (TRUE) + start_p11_kit_server (flatpak_dir); + else + g_debug ("p11-kit not found"); |