diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/networking/instant-messengers')
8 files changed, 25 insertions, 17 deletions
diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix index db488c2f670e..eeab5e32c0f2 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; - unpackPhase = ":"; + dontUnpack = true; dontWrapGApps = true; # we only want $gappsWrapperArgs here diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/sencha/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/sencha/default.nix index 1ca04a9e1686..4be8edaf9b85 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/sencha/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/sencha/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' makeWrapper ${sencha-bare}/sencha $out/bin/sencha diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 8f15c08cfc69..7ef42f8ddfdf 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -77,7 +77,7 @@ in stdenv.mkDerivation { buildInputs = [ dpkg ]; - unpackPhase = "true"; + dontUnpack = true; installPhase = '' mkdir -p $out dpkg -x $src $out diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix index 11e2e5baed87..76987d08ff4b 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation { inherit sha256; }; - unpackPhase = "true"; + dontUnpack = true; buildCommand = '' mkdir $out diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix index bd1a39565592..6ce33d4f0471 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -68,7 +68,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; - unpackPhase = "true"; + dontUnpack = true; buildCommand = '' mkdir -p $out dpkg -x $src $out diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 14289a66e259..3e5294815084 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -4,11 +4,11 @@ let mkTelegram = args: qt5.callPackage (import ./generic.nix args) { }; stableVersion = { stable = true; - version = "1.7.10"; - sha256Hash = "04if7siv0ib5sbdkdc7vwmxyjy3fnijrshgc8i8m79marfkn3wac"; + version = "1.7.14"; + sha256Hash = "1bw804a9kffmn23wv0570wihbvfm7jy9cqmxlv196f4j7bw7zkv3"; # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk - archPatchesRevision = "480743"; - archPatchesHash = "0jfyp642l2850yzgrw3irq8bn6vl44rx2693c5cshwbihd212af7"; + archPatchesRevision = "487779"; + archPatchesHash = "0f09hvimb66xqksb2v0zc4ryshx7y7z0rafzjd99x37rpib9f3kq"; }; in { stable = mkTelegram stableVersion; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix index ef9367553ff3..df06dc49eef4 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix @@ -28,13 +28,17 @@ mkDerivation rec { sha256 = archPatchesHash; }; - # TODO: libtgvoip.patch no-gtk2.patch - # TODO: Avoid tdesktop_lottie_animation_qtdebug.patch and tdesktop_qtlottie_qtdebug.patch - patches = [ "${archPatches}/tdesktop.patch" "${archPatches}/tdesktop_lottie_animation_qtdebug.patch" ]; + patches = [ + "${archPatches}/tdesktop.patch" + "${archPatches}/no-gtk2.patch" + # "${archPatches}/Use-system-wide-font.patch" + "${archPatches}/tdesktop_lottie_animation_qtdebug.patch" + "${archPatches}/issue6219.patch" + ]; postPatch = '' substituteInPlace Telegram/SourceFiles/platform/linux/linux_libs.cpp \ - --replace '"appindicator"' '"${libappindicator-gtk3}/lib/libappindicator3.so"' + --replace '"appindicator3"' '"${libappindicator-gtk3}/lib/libappindicator3.so"' substituteInPlace Telegram/SourceFiles/platform/linux/linux_libnotify.cpp \ --replace '"notify"' '"${libnotify}/lib/libnotify.so"' ''; @@ -75,12 +79,14 @@ mkDerivation rec { CPPFLAGS = NIX_CFLAGS_COMPILE; preConfigure = '' + patch -R -Np1 -i "${archPatches}/demibold.patch" + pushd "Telegram/ThirdParty/libtgvoip" patch -Np1 -i "${archPatches}/libtgvoip.patch" popd - pushd "Telegram/ThirdParty/qtlottie" - patch -Np1 -i "${archPatches}/tdesktop_qtlottie_qtdebug.patch" - popd + + # disable static-qt for rlottie + sed "/RLOTTIE_WITH_STATIC_QT/d" -i "Telegram/gyp/lib_rlottie.gyp" sed -i Telegram/gyp/telegram_linux.gypi \ -e 's,/usr,/does-not-exist,g' \ @@ -118,6 +124,8 @@ mkDerivation rec { export ASM=$(type -p gcc) ''; + cmakeFlags = [ "-UTDESKTOP_OFFICIAL_TARGET" ]; + installPhase = '' install -Dm755 Telegram $out/bin/telegram-desktop diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/viber/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/viber/default.nix index d7c70232b0ad..a4bf26a0b1af 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ dpkg makeWrapper ]; - unpackPhase = "true"; + dontUnpack = true; libPath = stdenv.lib.makeLibraryPath [ alsaLib |