diff options
author | Pascal Wittmann <mail@pascal-wittmann.de> | 2018-08-06 12:04:52 +0200 |
---|---|---|
committer | Pascal Wittmann <mail@pascal-wittmann.de> | 2018-08-06 12:04:52 +0200 |
commit | f7be21f4c98ba84e1b3eb7c77ecaed2fb82cce44 (patch) | |
tree | 5a7f8e0f97ec403b9aceb9276c8fb9e53bae9df5 /pkgs/applications/networking/instant-messengers | |
parent | 85afc926d8dfcbc079322594e803078d72a31f9f (diff) | |
parent | 6820e2f0dd16104961d6fc7e8e38846807159c4e (diff) | |
download | nixlib-f7be21f4c98ba84e1b3eb7c77ecaed2fb82cce44.tar nixlib-f7be21f4c98ba84e1b3eb7c77ecaed2fb82cce44.tar.gz nixlib-f7be21f4c98ba84e1b3eb7c77ecaed2fb82cce44.tar.bz2 nixlib-f7be21f4c98ba84e1b3eb7c77ecaed2fb82cce44.tar.lz nixlib-f7be21f4c98ba84e1b3eb7c77ecaed2fb82cce44.tar.xz nixlib-f7be21f4c98ba84e1b3eb7c77ecaed2fb82cce44.tar.zst nixlib-f7be21f4c98ba84e1b3eb7c77ecaed2fb82cce44.zip |
Merge branch 'master' into add-missing-licenses
Conflicts: pkgs/development/libraries/exiv2/default.nix Set license to gpl2Plus
Diffstat (limited to 'pkgs/applications/networking/instant-messengers')
3 files changed, 23 insertions, 5 deletions
diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 2cd30ab9604b..3682097e302f 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -13,13 +13,13 @@ }: stdenv.mkDerivation rec { - name = "dino-unstable-2018-06-03"; + name = "dino-unstable-2018-07-08"; src = fetchFromGitHub { owner = "dino"; repo = "dino"; - rev = "52e116ee44be1667660c08858a28fe8fda125f79"; - sha256 = "1yybmjd50r41366clrsw21qybbpjfkvim2n5b3dkcagjnifak0zl"; + rev = "df8b5fcb722c4a33ed18cbbaafecb206f127b849"; + sha256 = "1r7h9pxix0sylnwab7a8lir9h5yssk98128x2bzva77id9id33vi"; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 87ee10d0db7b..459bdf98b1e4 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -3,9 +3,24 @@ , dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite , libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib , cups, expat, udev +# Unfortunately this also overwrites the UI language (not just the spell +# checking language!): +, hunspellDicts, spellcheckerLanguage ? null # E.g. "de_DE" +# For a full list of available languages: +# $ cat pkgs/development/libraries/hunspell/dictionaries.nix | grep "dictFileName =" | awk '{ print $3 }' }: let + customLanguageWrapperArgs = (with lib; + let + # E.g. "de_DE" -> "de-de" (spellcheckerLanguage -> hunspellDict) + spellLangComponents = splitString "_" spellcheckerLanguage; + hunspellDict = elemAt spellLangComponents 0 + "-" + toLower (elemAt spellLangComponents 1); + in if spellcheckerLanguage != null + then '' + --set HUNSPELL_DICTIONARIES "${hunspellDicts.${hunspellDict}}/share/hunspell" \ + --set LC_MESSAGES "${spellcheckerLanguage}"'' + else ""); rpath = lib.makeLibraryPath [ alsaLib atk @@ -40,11 +55,11 @@ let in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.14.4"; + version = "1.15.0"; src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "0590r7748kv6g7zygq95v8qxf7vi2n5ypj6734x9yshrn8z6p8lr"; + sha256 = "1q73jx92h8zwk1dn103ymskz35q6kfiqc44886jr0p7mlpndqsa4"; }; phases = [ "unpackPhase" "installPhase" ]; @@ -68,6 +83,7 @@ in stdenv.mkDerivation rec { --set-rpath ${rpath}:$out/libexec $out/libexec/signal-desktop wrapProgram $out/libexec/signal-desktop \ --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ + ${customLanguageWrapperArgs} \ "''${gappsWrapperArgs[@]}" # Symlink to bin diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 39d664805fa9..e1ced2df9f37 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -14,5 +14,7 @@ in { stable = mkTelegram stableVersion; preview = mkTelegram (stableVersion // { stable = false; + version = "1.3.12"; + sha256Hash = "00z4ljs4fvbk7sf8wv1v50kln26gv8q12x6q41ai9gfzkvq5f69a"; }); } |