diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2018-03-27 12:00:17 +0200 |
|---|---|---|
| committer | Michael Weiss <dev.primeos@gmail.com> | 2018-03-27 12:03:17 +0200 |
| commit | 9a4871ad826f767992823c6ac385e96d12fb7af0 (patch) | |
| tree | 0efcd137874d2ca49ebdb4ed2812f585caadfc2f /pkgs/applications | |
| parent | 1a44de831a339771be5a8f804a5cea3a2b2b88d9 (diff) | |
| download | nixlib-9a4871ad826f767992823c6ac385e96d12fb7af0.tar nixlib-9a4871ad826f767992823c6ac385e96d12fb7af0.tar.gz nixlib-9a4871ad826f767992823c6ac385e96d12fb7af0.tar.bz2 nixlib-9a4871ad826f767992823c6ac385e96d12fb7af0.tar.lz nixlib-9a4871ad826f767992823c6ac385e96d12fb7af0.tar.xz nixlib-9a4871ad826f767992823c6ac385e96d12fb7af0.tar.zst nixlib-9a4871ad826f767992823c6ac385e96d12fb7af0.zip | |
tdesktop: 1.2.14 -> 1.2.15
tdesktopPackages.preview: 1.2.14 -> 1.2.15
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix | 12 |
2 files changed, 11 insertions, 5 deletions
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index afba9ab022ad..df0b6f39ca57 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -4,8 +4,8 @@ let mkTelegram = args: qt5.callPackage (import ./generic.nix args) { }; stableVersion = { stable = true; - version = "1.2.14"; - sha256Hash = "1412bls4qmfsa4nlqrxrc1j1jslhj6rhg8k69blhks9grrz36s1l"; + version = "1.2.15"; + sha256Hash = "18srw7g8h5zmc0plzqd03aijaylrsfaybraw97b1w9hj4lf2bl92"; # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk archPatchesRevision = "310557"; archPatchesHash = "1v134dal3xiapgh3akfr61vh62j24m9vkb62kckwvap44iqb0hlk"; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix index 7027e70f0c88..2588340de1de 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix @@ -1,7 +1,7 @@ { stable, version, sha256Hash, archPatchesRevision, archPatchesHash }: { mkDerivation, lib, fetchgit, fetchsvn -, pkgconfig, pythonPackages, cmake, makeWrapper +, pkgconfig, pythonPackages, cmake, wrapGAppsHook , qtbase, qtimageformats, gtk3, libappindicator-gtk3, libnotify , dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 }: @@ -37,7 +37,10 @@ mkDerivation rec { --replace '"notify"' '"${libnotify}/lib/libnotify.so"' ''; - nativeBuildInputs = [ pkgconfig pythonPackages.gyp cmake makeWrapper ]; + nativeBuildInputs = [ pkgconfig pythonPackages.gyp cmake wrapGAppsHook ]; + + # We want to run wrapProgram manually (with additional parameters) + dontWrapGApps = true; buildInputs = [ qtbase qtimageformats gtk3 libappindicator-gtk3 @@ -113,11 +116,14 @@ mkDerivation rec { for icon_size in 16 32 48 64 128 256 512; do install -Dm644 "../../../Telegram/Resources/art/icon''${icon_size}.png" "$out/share/icons/hicolor/''${icon_size}x''${icon_size}/apps/telegram-desktop.png" done + ''; + postFixup = '' # This is necessary to run Telegram in a pure environment. + # We also use gappsWrapperArgs from wrapGAppsHook. wrapProgram $out/bin/telegram-desktop \ + "''${gappsWrapperArgs[@]}" \ --prefix QT_PLUGIN_PATH : "${qtbase}/${qtbase.qtPluginPrefix}" \ - --suffix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ --set XDG_RUNTIME_DIR "XDG-RUNTIME-DIR" sed -i $out/bin/telegram-desktop \ -e "s,'XDG-RUNTIME-DIR',\"\''${XDG_RUNTIME_DIR:-/run/user/\$(id --user)}\"," |