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

Merge pull request #80453 from worldofpeace/p11-kit-flatpak

Browse Source 
flatpak: use correct p11-kit output
This commit is contained in:
worldofpeace 2020-02-18 18:14:28 -05:00 committed by GitHub
commit a3eef895bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
# Hardcode paths used by Flatpak itself. # Hardcode paths used by Flatpak itself.
(substituteAll { (substituteAll {
src = ./fix-paths.patch; src = ./fix-paths.patch;
p11 = p11-kit; p11kit = "${p11-kit.dev}/bin/p11-kit";
}) })
# Adapt paths exposed to sandbox for NixOS. # Adapt paths exposed to sandbox for NixOS.

2
pkgs/development/libraries/flatpak/fix-paths.patch
View File

@ -7,7 +7,7 @@ index 5dd7629e..ddc71a4c 100644
int i; int i;
char *p11_argv[] = { char *p11_argv[] = {
- "p11-kit", "server", - "p11-kit", "server",
+ "@p11@/bin/p11-kit", "server", + "@p11kit@", "server",
/* We explicitly request --sh here, because we then fail on earlier versions that doesn't support /* 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 * 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. * the spawn_sync to hang forever, waiting for the pipe to close.