diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index b0f7b3d54fee..d295bde3ae5e 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -32,6 +32,7 @@ , jemalloc , rnnoise , abseil-cpp +, kcoreaddons # Transitive dependencies: , util-linuxMinimal , pcre @@ -73,7 +74,7 @@ let in env.mkDerivation rec { pname = "telegram-desktop"; - version = "4.1.1"; + version = "4.2.0"; # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py # Telegram-Desktop with submodules @@ -82,7 +83,7 @@ env.mkDerivation rec { repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "0b8nwimks6hfnb3bqik8d4s9z689hhj4p9ykqgc36pmpr54nyma8"; + sha256 = "1wpqn79pbarz48kmrh6gciw4a9y5hiki5qczlvj8smvx9is6yrf8"; }; postPatch = '' @@ -138,6 +139,7 @@ env.mkDerivation rec { jemalloc rnnoise tg_owt + kcoreaddons # Transitive dependencies: util-linuxMinimal # Required for libmount thus not nativeBuildInputs. pcre @@ -194,6 +196,6 @@ env.mkDerivation rec { platforms = platforms.linux; homepage = "https://desktop.telegram.org/"; changelog = "https://github.com/telegramdesktop/tdesktop/releases/tag/v${version}"; - maintainers = with maintainers; [ oxalica ]; + maintainers = with maintainers; [ nickcao ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix index 590e8f337fe6..c1101a1f2d41 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "tg_owt"; - version = "unstable-2022-08-11"; + version = "unstable-2022-09-14"; src = fetchFromGitHub { owner = "desktop-app"; repo = "tg_owt"; - rev = "a5fbc9123e056e611e69acf0ceb4252ddd838adb"; - sha256 = "1hzck63spjjkqzkj0mlrxygrix4lw0n3i5cmc0vkxaphfzawz74n"; + rev = "621f3da55331733bf0d1b223786b96b68c03dca1"; + sha256 = "0xh4mm8lpiyj3c62iarsld8q82a1w81x3dxdlcwq8s6sg3r04fns"; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index e9a333c98a19..31bce026daa0 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -40,7 +40,7 @@ let mirror = "mirror://kde"; }; - mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {}; + mkDerivation = libsForQt5.callPackage ({ stdenv, mkDerivation ? stdenv.mkDerivation }: mkDerivation) {}; packages = self: with self; # SUPPORT diff --git a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix index f790d802c0ca..fbd671099465 100644 --- a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix @@ -1,12 +1,21 @@ { - mkDerivation, + mkDerivation, lib, extra-cmake-modules, qtbase, qttools, shared-mime-info }: -mkDerivation { +mkDerivation ({ pname = "kcoreaddons"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qttools shared-mime-info ]; propagatedBuildInputs = [ qtbase ]; -} +} // lib.optionalAttrs (lib.versionAtLeast qtbase.version "6") { + dontWrapQtApps = true; + cmakeFlags = [ + "-DBUILD_WITH_QT6=ON" + "-DEXCLUDE_DEPRECATED_BEFORE_AND_AT=CURRENT" + ]; + postInstall = '' + moveToOutput "mkspecs" "$dev" + ''; +}) diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix index e6f3b4ae5fd5..3320ff4ee204 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -14,11 +14,20 @@ let libsForQt6 = self; callPackage = self.callPackage; + kdeFrameworks = let + mkFrameworks = import ../development/libraries/kde-frameworks; + attrs = { + libsForQt5 = libsForQt6; + inherit (pkgs) lib fetchurl; + }; + in (lib.makeOverridable mkFrameworks attrs); in (qt6 // { # LIBRARIES + inherit (kdeFrameworks) kcoreaddons; + quazip = callPackage ../development/libraries/quazip { }; poppler = callPackage ../development/libraries/poppler {