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: deedc8803eee
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7819700bad77
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Nov 8, 2018

  1. Add chrome-token-signing 

    (cherry picked from commit 068374c)
Signed-off-by: Domen Kožar <domen@dev.si>
    @domenkozar
    domenkozar committed Nov 8, 2018
    Copy the full SHA
    7819700 View commit details
Showing with 29 additions and 0 deletions.
  1. +27 −0 pkgs/tools/security/chrome-token-signing/default.nix
  2. +2 −0 pkgs/top-level/all-packages.nix
27 changes: 27 additions & 0 deletions pkgs/tools/security/chrome-token-signing/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{ stdenv, fetchFromGitHub, qmake, pcsclite, pkgconfig }:

stdenv.mkDerivation rec {
name = "chrome-token-signing-${version}";
version = "1.0.7";

src = fetchFromGitHub {
owner = "open-eid";
repo = "chrome-token-signing";
rev = "v${version}";
sha256 = "1icbr5gyf7qqk1qjgcrf6921ws84j5h8zrpzw5mirq4582l5gsav";
};

buildInputs = [ qmake pcsclite pkgconfig ];
dontUseQmakeConfigure = true;

patchPhase = ''
substituteInPlace host-linux/ee.ria.esteid.json --replace /usr $out
'';

installPhase = ''
install -D -t $out/bin host-linux/chrome-token-signing
# TODO: wire these up
install -D -t $out/etc/chromium/native-messaging-hosts host-linux/ee.ria.esteid.json
install -D -t $out/lib/mozilla/native-messaging-hosts host-linux/ff/ee.ria.esteid.json
'';
}
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -22295,6 +22295,8 @@ with pkgs;

chrome-gnome-shell = callPackage ../desktops/gnome-3/extensions/chrome-gnome-shell {};

chrome-token-signing = libsForQt5.callPackage ../tools/security/chrome-token-signing {};

NSPlist = callPackage ../development/libraries/NSPlist {};

PlistCpp = callPackage ../development/libraries/PlistCpp {};