From c73ff37cd5601c144138e1de57be3575bac8bb8e Mon Sep 17 00:00:00 2001 From: arcnmx Date: Sat, 27 Jul 2019 11:50:08 -0700 Subject: passff-host: fix native messaging manifest path Match other native messaging applications and the firefox wrapper's expectations. --- pkgs/tools/security/passff-host/default.nix | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/security/passff-host/default.nix b/pkgs/tools/security/passff-host/default.nix index a97bc57ad45..59f03db0200 100644 --- a/pkgs/tools/security/passff-host/default.nix +++ b/pkgs/tools/security/passff-host/default.nix @@ -1,27 +1,41 @@ { stdenv, fetchFromGitHub, python3, pass }: stdenv.mkDerivation rec { - name = "passff-host-${version}"; + pname = "passff-host"; version = "1.2.1"; src = fetchFromGitHub { owner = "passff"; - repo = "passff-host"; + repo = pname; rev = version; sha256 = "0ydfwvhgnw5c3ydx2gn5d7ys9g7cxlck57vfddpv6ix890v21451"; }; buildInputs = [ python3 ]; + makeFlags = [ "VERSION=${version}" ]; patchPhase = '' sed -i 's#COMMAND = "pass"#COMMAND = "${pass}/bin/pass"#' src/passff.py ''; installPhase = '' - install -D bin/testing/passff.py $out/share/passff-host/passff.py - cp bin/testing/passff.json $out/share/passff-host/passff.json - substituteInPlace $out/share/passff-host/passff.json \ + substituteInPlace bin/${version}/passff.json \ --replace PLACEHOLDER $out/share/passff-host/passff.py + + install -Dt $out/share/passff-host \ + bin/${version}/passff.{py,json} + + nativeMessagingPaths=( + /lib/mozilla/native-messaging-hosts + /etc/opt/chrome/native-messaging-hosts + /etc/chromium/native-messaging-hosts + /etc/vivaldi/native-messaging-hosts + ) + + for manifestDir in "''${nativeMessagingPaths[@]}"; do + install -d $out$manifestDir + ln -s $out/share/passff-host/passff.json $out$manifestDir/ + done ''; meta = with stdenv.lib; { -- cgit 1.4.1