git.iko.soy/typeable/nixpkgs
on master help sign in
tdesktop: 2.4.4 -> 2.4.5
commit680d3201230c7864755bff80fcdef30d7487500a authorMichael Weiss <dev.primeos@gmail.com> dateSat 31 Oct 2020, 13:57 (6 years ago) parentf28c4a1
3 files changed+4−165
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix+2−2 pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt-install.patch−159 pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix+2−4
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix+2−2
@@ -22,12 +22,12 @@ let
2222
2323in mkDerivation rec {
2424 pname = "telegram-desktop";
25− version = "2.4.4";
25+ version = "2.4.5";
2626
2727 # Telegram-Desktop with submodules
2828 src = fetchurl {
2929 url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz";
30− sha256 = "09lhikaybf57rki62miqcaxxrdg1ni2rj9aj4w9mrbzdv849fyc8";
30+ sha256 = "0nhzypgc45f5gqy53azj7mljnj7p9p0m7bil02f9cih1dg5sdxx5";
3131 };
3232
3333 postPatch = ''
pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt-install.patchdeleted−159
@@ -1,159 +0,0 @@
1−diff --git a/CMakeLists.txt b/CMakeLists.txt
2−index 6fbc0da..6cbff3c 100644
3−--- a/CMakeLists.txt
4−+++ b/CMakeLists.txt
5−@@ -1856,3 +1856,41 @@ configure_file(
6− "${CMAKE_CURRENT_BINARY_DIR}/tg_owtConfig.cmake"
7− COPYONLY
8− )
9−+
10−+install(
11−+TARGETS
12−+ tg_owt
13−+ libabsl
14−+ libopenh264
15−+ libpffft
16−+ librnnoise
17−+ libsrtp
18−+ libusrsctp
19−+ libvpx
20−+ ${vpx_export}
21−+ libwebrtcbuild
22−+ libyuv
23−+ ${platform_export}
24−+EXPORT tg_owtTargets
25−+RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
26−+ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
27−+LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
28−+INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
29−+)
30−+
31−+install(
32−+ DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/src/
33−+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
34−+ FILES_MATCHING PATTERN "*.h"
35−+)
36−+
37−+install(
38−+ EXPORT tg_owtTargets
39−+ NAMESPACE tg_owt::
40−+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/tg_owt
41−+)
42−+
43−+install(
44−+ FILES ${CMAKE_CURRENT_BINARY_DIR}/tg_owtConfig.cmake
45−+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/tg_owt
46−+)
47−diff --git a/cmake/libabsl.cmake b/cmake/libabsl.cmake
48−index 2fb3b8c..4a4f85b 100644
49−--- a/cmake/libabsl.cmake
50−+++ b/cmake/libabsl.cmake
51−@@ -123,5 +123,6 @@ PRIVATE
52−
53− target_include_directories(libabsl
54− PUBLIC
55−- ${libabsl_loc}
56−+ $<BUILD_INTERFACE:${libabsl_loc}>
57−+ $<INSTALL_INTERFACE:include/third_party/abseil-cpp>
58− )
59−diff --git a/cmake/libpffft.cmake b/cmake/libpffft.cmake
60−index a6ceb3e..435d3a3 100644
61−--- a/cmake/libpffft.cmake
62−+++ b/cmake/libpffft.cmake
63−@@ -24,5 +24,6 @@ endif()
64−
65− target_include_directories(libpffft
66− PUBLIC
67−- ${libpffft_loc}
68−+ $<BUILD_INTERFACE:${libpffft_loc}>
69−+ $<INSTALL_INTERFACE:include/third_party/pffft/src>
70− )
71−diff --git a/cmake/libsrtp.cmake b/cmake/libsrtp.cmake
72−index 57c54b5..26b3466 100644
73−--- a/cmake/libsrtp.cmake
74−+++ b/cmake/libsrtp.cmake
75−@@ -30,6 +30,8 @@ PRIVATE
76−
77− target_include_directories(libsrtp
78− PUBLIC
79−- ${libsrtp_loc}/include
80−- ${libsrtp_loc}/crypto/include
81−+ $<BUILD_INTERFACE:${libsrtp_loc}/include>
82−+ $<BUILD_INTERFACE:${libsrtp_loc}/crypto/include>
83−+ $<INSTALL_INTERFACE:include/third_party/libsrtp/include>
84−+ $<INSTALL_INTERFACE:include/third_party/libsrtp/crypto/include>
85− )
86−diff --git a/cmake/libusrsctp.cmake b/cmake/libusrsctp.cmake
87−index caa0529..38d2ef6 100644
88−--- a/cmake/libusrsctp.cmake
89−+++ b/cmake/libusrsctp.cmake
90−@@ -67,6 +67,8 @@ endif()
91−
92− target_include_directories(libusrsctp
93− PUBLIC
94−- ${third_party_loc}/usrsctp/usrsctplib
95−- ${libusrsctp_loc}
96−+ $<BUILD_INTERFACE:${third_party_loc}/usrsctp/usrsctplib>
97−+ $<BUILD_INTERFACE:${libusrsctp_loc}>
98−+ $<INSTALL_INTERFACE:include/third_party/usrsctp/usrsctplib/usrsctplib>
99−+ $<INSTALL_INTERFACE:include/third_party/usrsctp/usrsctplib>
100− )
101−diff --git a/cmake/libvpx.cmake b/cmake/libvpx.cmake
102−index e192e7e..78cf25b 100644
103−--- a/cmake/libvpx.cmake
104−+++ b/cmake/libvpx.cmake
105−@@ -68,6 +68,11 @@ else()
106− set(ASM_SUFFIX ".asm.S")
107− endif()
108−
109−+foreach(dir ${include_directories})
110−+ string(REPLACE ${libvpx_loc} include/third_party/libvpx install_include_dir ${dir})
111−+ list(APPEND install_include_directories ${install_include_dir})
112−+endforeach()
113−+
114− function(add_sublibrary postfix)
115− add_library(libvpx_${postfix} OBJECT)
116− init_feature_target(libvpx_${postfix} ${postfix})
117−@@ -75,6 +80,8 @@ function(add_sublibrary postfix)
118− target_include_directories(libvpx_${postfix}
119− PRIVATE
120− ${include_directories}
121−+ "$<BUILD_INTERFACE:${include_directories}>"
122−+ "$<INSTALL_INTERFACE:${install_include_directories}>"
123− )
124− set(sources_list ${ARGV})
125− list(REMOVE_AT sources_list 0)
126−@@ -725,5 +732,6 @@ endif()
127−
128− target_include_directories(libvpx
129− PUBLIC
130−- ${include_directories}
131−+ "$<BUILD_INTERFACE:${include_directories}>"
132−+ "$<INSTALL_INTERFACE:${install_include_directories}>"
133− )
134−diff --git a/cmake/libwebrtcbuild.cmake b/cmake/libwebrtcbuild.cmake
135−index c3520b8..9b4b543 100644
136−--- a/cmake/libwebrtcbuild.cmake
137−+++ b/cmake/libwebrtcbuild.cmake
138−@@ -44,5 +44,6 @@ endif()
139−
140− target_include_directories(libwebrtcbuild
141− INTERFACE
142−- ${webrtc_loc}
143−+ $<BUILD_INTERFACE:${webrtc_loc}>
144−+ $<INSTALL_INTERFACE:include>
145− )
146−diff --git a/cmake/libyuv.cmake b/cmake/libyuv.cmake
147−index ebfc6f0..18e70ef 100644
148−--- a/cmake/libyuv.cmake
149−+++ b/cmake/libyuv.cmake
150−@@ -126,7 +126,8 @@ endif()
151−
152− target_include_directories(libyuv
153− PUBLIC
154−- ${libyuv_loc}/include
155−+ $<BUILD_INTERFACE:${libyuv_loc}/include>
156−+ $<INSTALL_INTERFACE:include/third_party/libyuv/include>
157− )
158−
159− target_compile_definitions(libyuv
pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix+2−4
@@ -3,8 +3,8 @@
33}:
44
55let
6− rev = "c73a4718cbff7048373a63db32068482e5fd11ef";
7− sha256 = "0nr20mvvmmg8ii8f2rljd7iv2szplcfjn40rpy6llkmf705mwr1k";
6+ rev = "1d4f7d74ff1a627db6e45682efd0e3b85738e426";
7+ sha256 = "1w03xmjn693ff489pg368jv21478vr4ldxyya4lsrx87fn88caj3";
88
99in stdenv.mkDerivation {
1010 pname = "tg_owt";
@@ -16,8 +16,6 @@ in stdenv.mkDerivation {
1616 inherit rev sha256;
1717 };
1818
19− patches = [ ./tg_owt-install.patch ];
20−
2119 nativeBuildInputs = [ pkg-config cmake ninja yasm ];
2220
2321 buildInputs = [ libjpeg openssl libopus ffmpeg alsaLib libpulseaudio ];