From dff239d7b114d49dac46d1d39cb459cd0e4df06a Mon Sep 17 00:00:00 2001 From: Guillaume Koenig Date: Thu, 30 Nov 2017 18:43:39 +0100 Subject: enpass: fix install to work with firefox webextensions With new Firefox 57 and WebExtensions, the new addon uses Firefox' Native Messaging mechanism to communicate with local programs (here the main enpass program). This commit activates EnpassNMHost, a binary that bootstraps communication between the two. --- pkgs/tools/security/enpass/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'pkgs/tools/security/enpass') diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/tools/security/enpass/default.nix index 449a6911a15..1bf5a9033b9 100644 --- a/pkgs/tools/security/enpass/default.nix +++ b/pkgs/tools/security/enpass/default.nix @@ -67,12 +67,13 @@ let cp -r usr/* $out rm $out/bin/runenpass.sh cp $out/bin/EnpassHelper/EnpassHelper{,.untampered} + cp $out/bin/EnpassHelper/EnpassNMHost{,.untampered} sed \ -i s@/opt/Enpass/bin/runenpass.sh@$out/bin/Enpass@ \ $out/share/applications/enpass.desktop - for i in $out/bin/{Enpass,EnpassHelper/EnpassHelper}; do + for i in $out/bin/{Enpass,EnpassHelper/{EnpassHelper,EnpassNMHost}}; do patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $i done @@ -85,8 +86,15 @@ let --set QT_XKB_CONFIG_ROOT "${xkeyboardconfig}/share/X11/xkb" \ --set HIDE_TOOLBAR_LINE 0 \ --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ - --set NIX_REDIRECTS "$out/bin/EnpassHelper/EnpassHelper=$out/bin/EnpassHelper/EnpassHelper.untampered" \ + --set NIX_REDIRECTS "$out/bin/EnpassHelper/EnpassHelper=$out/bin/EnpassHelper/EnpassHelper.untampered:$out/bin/EnpassHelper/EnpassNMHost=$out/bin/EnpassHelper/EnpassNMHost.untampered" \ --prefix PATH : ${lsof}/bin + + makeWrapper $out/bin/EnpassHelper/{EnpassNMHost,runNativeMessaging.sh} \ + --set LD_LIBRARY_PATH "${libPath}:$out/lib:$out/plugins/sqldrivers" \ + --set QT_PLUGIN_PATH "$out/plugins" \ + --set QT_QPA_PLATFORM_PLUGIN_PATH "$out/plugins/platforms" \ + --set QT_XKB_CONFIG_ROOT "${xkeyboardconfig}/share/X11/xkb" \ + --set HIDE_TOOLBAR_LINE 0 ''; }; updater = { -- cgit 1.4.1