enpass: bump to 5.4.0.post4 and fix application icon

This commit is contained in:
Ronny Pfannschmidt 2016-12-27 14:23:16 +01:00
parent 5ba7f33e3a
commit 1765784b5e
2 changed files with 13 additions and 21 deletions

View File

@ -1,12 +1,12 @@
{ {
"amd64": { "amd64": {
"path": "pool/main/e/enpass/enpass_5.3.0_amd64.deb", "path": "pool/main/e/enpass/enpass_5.4.0-4_amd64.deb",
"sha256": "d9da061c6456281da836bdd78bdb7baeced4b7f1805bb2495e4f1d15038cf86b", "sha256": "6b460fed2d7d8473e2b5d069dbe60263195b916c8b79a8fc7c2e8cb953134579",
"version": "5.3.0" "version": "5.4.0.post4"
}, },
"i386": { "i386": {
"path": "pool/main/e/enpass/enpass_5.3.0_i386.deb", "path": "pool/main/e/enpass/enpass_5.4.0-4_i386.deb",
"sha256": "58d9f3b83c2da477c13976e1826d112236eabd46a389de7e8767ee99ac41f469", "sha256": "1ec8088d5c3b2906d6820f96e1868c473e78dbe882f04e74a7816d19d43e3692",
"version": "5.3.0" "version": "5.4.0.post4"
} }
} }

View File

@ -44,16 +44,6 @@ let
inherit (data) version; inherit (data) version;
name = "enpass-${version}"; name = "enpass-${version}";
desktopItem = makeDesktopItem {
name = "Enpass";
exec = "$out/bin/Enpass";
#icon = "Enpass";
desktopName = "Enpass";
genericName = "Password manager";
categories = "Application;Security;";
};
src = fetchurl { src = fetchurl {
inherit (data) sha256; inherit (data) sha256;
url = "${baseUrl}/${data.path}"; url = "${baseUrl}/${data.path}";
@ -74,11 +64,12 @@ let
installPhase='' installPhase=''
mkdir $out mkdir $out
cp -r opt/Enpass/* $out cp -r opt/Enpass/* $out
cp -r usr/* $out
rm $out/bin/runenpass.sh
# Make desktop item sed \
mkdir -p "$out"/share/applications -i s@/opt/Enpass/bin/runenpass.sh@$out/bin/Enpass@ \
cp "$desktopItem"/share/applications/* "$out"/share/applications/ $out/share/applications/enpass.desktop
mkdir -p "$out"/share/icons
patchelf \ patchelf \
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
@ -88,7 +79,8 @@ let
--set LD_LIBRARY_PATH "${libPath}:$out/lib:$out/plugins/sqldrivers" \ --set LD_LIBRARY_PATH "${libPath}:$out/lib:$out/plugins/sqldrivers" \
--set QT_PLUGIN_PATH "$out/plugins" \ --set QT_PLUGIN_PATH "$out/plugins" \
--set QT_QPA_PLATFORM_PLUGIN_PATH "$out/plugins/platforms" \ --set QT_QPA_PLATFORM_PLUGIN_PATH "$out/plugins/platforms" \
--set QT_XKB_CONFIG_ROOT "${xkeyboardconfig}/share/X11/xkb" --set QT_XKB_CONFIG_ROOT "${xkeyboardconfig}/share/X11/xkb" \
--set HIDE_TOOLBAR_LINE 0
''; '';
}; };
updater = { updater = {