diff options
| author | Guillaume Koenig <guillaume.edward.koenig@gmail.com> | 2016-12-04 17:25:35 +0100 |
|---|---|---|
| committer | Graham Christensen <graham@grahamc.com> | 2016-12-29 19:57:09 -0500 |
| commit | 0465b1407bc0b69c2b35e281fbafb615715ef280 (patch) | |
| tree | c4f7da772244e00a37c28e04849296b2b01d84b3 /pkgs/tools/security/enpass | |
| parent | eb01090301bff2cd72712cfd24b8773dae0e43cd (diff) | |
enpass: fix install to work with browser extensions
Diffstat (limited to 'pkgs/tools/security/enpass')
| -rw-r--r-- | pkgs/tools/security/enpass/default.nix | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/tools/security/enpass/default.nix index f2e73e2749ed4..257af4645f68d 100644 --- a/pkgs/tools/security/enpass/default.nix +++ b/pkgs/tools/security/enpass/default.nix @@ -1,7 +1,8 @@ {stdenv, system, fetchurl, dpkg, openssl, xorg , glib, mesa, libpulseaudio, zlib, dbus, fontconfig, freetype , gtk2, pango, atk, cairo, gdk_pixbuf, jasper, xkeyboardconfig -, makeWrapper , makeDesktopItem, python, pythonPackages, lib}: +, makeWrapper , makeDesktopItem, python, pythonPackages, lib +, libredirect, lsof}: assert system == "i686-linux" || system == "x86_64-linux"; let all_data = (with builtins; fromJSON (readFile ./data.json)); @@ -13,7 +14,7 @@ let data = (with builtins; getAttr (getAttr system system_map) all_data); baseUrl = http://repo.sinew.in; - + # used of both wrappers and libpath libPath = lib.makeLibraryPath (with xorg; [ openssl @@ -66,28 +67,34 @@ let cp -r opt/Enpass/* $out cp -r usr/* $out rm $out/bin/runenpass.sh + cp $out/bin/EnpassHelper/EnpassHelper{,.untampered} sed \ -i s@/opt/Enpass/bin/runenpass.sh@$out/bin/Enpass@ \ - $out/share/applications/enpass.desktop + $out/share/applications/enpass.desktop - patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - $out/bin/Enpass + for i in $out/bin/{Enpass,EnpassHelper/EnpassHelper}; do + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $i + done + # The helper's sha256 sum must match, hence the use of libredirect. + # Also, lsof must be in the path for proper operation. wrapProgram $out/bin/Enpass \ --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 + --set HIDE_TOOLBAR_LINE 0 \ + --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ + --set NIX_REDIRECTS "$out/bin/EnpassHelper/EnpassHelper=$out/bin/EnpassHelper/EnpassHelper.untampered" \ + --prefix PATH : ${lsof}/bin ''; }; updater = { update = stdenv.mkDerivation rec { name = "enpass-update-script"; SCRIPT =./update_script.py; - + buildInputs = with pythonPackages; [python requests pathlib2 six attrs ]; shellHook = '' exec python $SCRIPT --target pkgs/tools/security/enpass/data.json --repo ${baseUrl} @@ -95,4 +102,4 @@ let }; }; -in (package // {refresh = updater;}) +in (package // {refresh = updater;}) |