Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 04273c347d26
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f0e33aed938b
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Apr 25, 2020

  1. p11-kit: add trust paths 

    Fixes  #82422

(cherry picked from commit 4c40b43)
    @worldofpeace
    worldofpeace committed Apr 25, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    vszakats Viktor Szakats
    GPG key ID: B5ABD165E2AEF201
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9ce58f6 View commit details

  2. flatpak: use correct p11-kit output 

    Fixes #80452

(cherry picked from commit 02213fd)
    @worldofpeace
    worldofpeace committed Apr 25, 2020
    Copy the full SHA
    0fc04df View commit details

  3. Merge pull request #86017 from worldofpeace/p11-kit-trust-paths-19.09 

    [19.09] p11-kit: add trust paths
    @worldofpeace
    worldofpeace authored Apr 25, 2020
    Copy the full SHA
    f0e33ae View commit details
Showing with 7 additions and 5 deletions.
  1. +1 −1 pkgs/development/libraries/flatpak/default.nix
  2. +1 −1 pkgs/development/libraries/flatpak/fix-paths.patch
  3. +5 −3 pkgs/development/libraries/p11-kit/default.nix
2 changes: 1 addition & 1 deletion pkgs/development/libraries/flatpak/default.nix
View file
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
})
(substituteAll {
src = ./fix-paths.patch;
p11 = p11-kit;
p11kit = "${p11-kit.dev}/bin/p11-kit";
})
(substituteAll {
src = ./bubblewrap-paths.patch;
2 changes: 1 addition & 1 deletion pkgs/development/libraries/flatpak/fix-paths.patch
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ index 5dd7629e..ddc71a4c 100644
int i;
char *p11_argv[] = {
- "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
* 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.
8 changes: 5 additions & 3 deletions pkgs/development/libraries/p11-kit/default.nix
View file
Original file line number Diff line number Diff line change
@@ -26,14 +26,16 @@ stdenv.mkDerivation rec {
configureFlags = [
"--sysconfdir=/etc"
"--localstatedir=/var"
"--without-trust-paths"
]; # TODO: store trust anchors in a directory common to Nix and NixOS
"--with-trust-paths=/etc/ssl/certs/ca-certificates.crt"
];

enableParallelBuilding = true;

doCheck = !stdenv.isDarwin;

installFlags = [ "exampledir=\${out}/etc/pkcs11" ];
installFlags = [
"exampledir=${placeholder "out"}/etc/pkcs11"
];

meta = with stdenv.lib; {
description = "Library for loading and sharing PKCS#11 modules";