flatpak: use correct p11-kit output · pyrox.dev/nixpkgs@02213fd

pyrox.dev / nixpkgs

fork atom

lol

fork atom

flatpak: use correct p11-kit output

Fixes #80452

worldofpeace 6 years ago 02213fdf 59bf79ec

+2 -2

2 changed files

expand all

pkgs

development

libraries

flatpak

default.nix

fix-paths.patch

+1 -1

pkgs/development/libraries/flatpak/default.nix

··· 79 79 # Hardcode paths used by Flatpak itself. 80 80 (substituteAll { 81 81 src = ./fix-paths.patch; 82 - p11 = p11-kit; 82 + p11kit = "${p11-kit.dev}/bin/p11-kit"; 83 83 }) 84 84 85 85 # Adapt paths exposed to sandbox for NixOS.

+1 -1

pkgs/development/libraries/flatpak/fix-paths.patch

··· 7 7 int i; 8 8 char *p11_argv[] = { 9 9 - "p11-kit", "server", 10 - + "@p11@/bin/p11-kit", "server", 10 + + "@p11kit@", "server", 11 11 /* We explicitly request --sh here, because we then fail on earlier versions that doesn't support 12 12 * this flag. This is good, because those earlier versions did not properly daemonize and caused 13 13 * the spawn_sync to hang forever, waiting for the pipe to close.