From 7ca4469122ec00a16821b60131ef9e41fa0f6872 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 16 Oct 2020 15:49:25 +0200 Subject: [PATCH] tdesktop: Drop unused CMake variables and passthru tg_owt Before this change: > CMake Warning: > Manually-specified variables were not used by the project: > > BUILD_TESTING > CMAKE_EXPORT_NO_PACKAGE_REGISTRY > CMAKE_POLICY_DEFAULT_CMP0025 > DESKTOP_APP_USE_PACKAGED_GSL > DESKTOP_APP_USE_PACKAGED_RLOTTIE > DESKTOP_APP_USE_PACKAGED_VARIANT > TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME > TDESKTOP_USE_PACKAGED_TGVOIP --- .../instant-messengers/telegram/tdesktop/default.nix | 9 ++++----- 1 file changed, 4 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 fff4400e0a4..a1a1103b4fd 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -59,11 +59,6 @@ in mkDerivation rec { # We're allowed to used the API ID of the Snap package: "-DTDESKTOP_API_ID=611335" "-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c" - "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF" - "-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF" - "-DDESKTOP_APP_USE_PACKAGED_GSL=OFF" - "-DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME=ON" - "-DTDESKTOP_USE_PACKAGED_TGVOIP=OFF" #"-DDESKTOP_APP_SPECIAL_TARGET=\"\"" # TODO: Error when set to "": Bad special target '""' "-DTDESKTOP_LAUNCHER_BASENAME=telegramdesktop" # Note: This is the default ]; @@ -100,6 +95,10 @@ in mkDerivation rec { -e "s,'XDG-RUNTIME-DIR',\"\''${XDG_RUNTIME_DIR:-/run/user/\$(id --user)}\"," ''; + passthru = { + inherit tg_owt; + }; + meta = { description = "Telegram Desktop messaging app"; longDescription = ''