@@ -7,7 +7,6 @@
77, ninja
88, clang
99, python3
10−, wrapGAppsHook
1110, wrapQtAppsHook
1211, removeReferencesTo
1312, extra-cmake-modules
@@ -27,7 +26,6 @@
2726, tl-expected
2827, hunspell
2928, glibmm
30−, webkitgtk
3129, jemalloc
3230, rnnoise
3331, abseil-cpp
@@ -65,7 +63,6 @@
6563, IOSurface
6664, Metal
6765, MetalKit
68−, withWebKit ? false
6966}:
7067
7168with lib;
@@ -113,9 +110,6 @@ stdenv.mkDerivation rec {
113110 --replace '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"'
114111 substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp \
115112 --replace '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"'
116− '' + optionalString (stdenv.isLinux && withWebKit) ''
117− substituteInPlace Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.cpp \
118− --replace '"libwebkit2gtk-4.0.so.37"' '"${webkitgtk}/lib/libwebkit2gtk-4.0.so.37"'
119113 '' + optionalString stdenv.isDarwin ''
120114 substituteInPlace Telegram/CMakeLists.txt \
121115 --replace 'COMMAND iconutil' 'COMMAND png2icns' \
@@ -124,10 +118,6 @@ stdenv.mkDerivation rec {
124118 --replace "\''${appicon_path}" "\''${appicon_path}/icon_16x16.png \''${appicon_path}/icon_32x32.png \''${appicon_path}/icon_128x128.png \''${appicon_path}/icon_256x256.png \''${appicon_path}/icon_512x512.png"
125119 '';
126120
127− # We want to run wrapProgram manually (with additional parameters)
128− dontWrapGApps = stdenv.isLinux;
129− dontWrapQtApps = stdenv.isLinux && withWebKit;
130−
131121 nativeBuildInputs = [
132122 pkg-config
133123 cmake
@@ -139,8 +129,6 @@ stdenv.mkDerivation rec {
139129 # to build bundled libdispatch
140130 clang
141131 extra-cmake-modules
142− ] ++ optionals (stdenv.isLinux && withWebKit) [
143− wrapGAppsHook
144132 ];
145133
146134 buildInputs = [
@@ -166,8 +154,6 @@ stdenv.mkDerivation rec {
166154 glibmm
167155 jemalloc
168156 wayland
169− ] ++ optionals (stdenv.isLinux && withWebKit) [
170− webkitgtk
171157 ] ++ optionals stdenv.isDarwin [
172158 Cocoa
173159 CoreFoundation
@@ -225,13 +211,6 @@ stdenv.mkDerivation rec {
225211 remove-references-to -t ${tg_owt.dev} $out/bin/$binName
226212 '';
227213
228− postFixup = optionalString (stdenv.isLinux && withWebKit) ''
229− # We also use gappsWrapperArgs from wrapGAppsHook.
230− wrapProgram $out/bin/kotatogram-desktop \
231− "''${gappsWrapperArgs[@]}" \
232− "''${qtWrapperArgs[@]}"
233− '';
234−
235214 passthru = {
236215 inherit tg_owt;
237216 };