diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-12-01 21:09:17 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-01 21:09:17 +0000 |
| commit | 6d2167fc1e45150d8f945933d97aad1cb8464155 (patch) | |
| tree | 18634612eea4b748684f7023b23e41c62629d2e2 /pkgs/tools/security/enpass | |
| parent | dd40eaef6f9243b06b3a73c35c85251e3c3d4888 (diff) | |
| parent | dff239d7b114d49dac46d1d39cb459cd0e4df06a (diff) | |
| download | nixpkgs-6d2167fc1e45150d8f945933d97aad1cb8464155.tar nixpkgs-6d2167fc1e45150d8f945933d97aad1cb8464155.tar.gz nixpkgs-6d2167fc1e45150d8f945933d97aad1cb8464155.tar.bz2 nixpkgs-6d2167fc1e45150d8f945933d97aad1cb8464155.tar.lz nixpkgs-6d2167fc1e45150d8f945933d97aad1cb8464155.tar.xz nixpkgs-6d2167fc1e45150d8f945933d97aad1cb8464155.tar.zst nixpkgs-6d2167fc1e45150d8f945933d97aad1cb8464155.zip | |
Merge pull request #32236 from guillaumekoenig/fix-enpass-firefox-webextensions
enpass: fix install to work with firefox webextensions
Diffstat (limited to 'pkgs/tools/security/enpass')
| -rw-r--r-- | pkgs/tools/security/enpass/default.nix | 12 |
1 files changed, 10 insertions, 2 deletions
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 = { |