JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "tdesktop: Add a temporary workaround to fix the Linux build"

Browse Source 
This reverts commit e7987936c1.
With 57f0574595 in master this workaround is not required anymore.
This commit is contained in:
Michael Weiss 2020-08-25 17:36:34 +02:00
parent 6b34320036
commit f9c74c3f4b
No known key found for this signature in database
GPG Key ID: 5BE487C4D4771D83
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
View File

@ -1,4 +1,4 @@
{ mkDerivation, lib, fetchurl, fetchsvn, stdenv
{ mkDerivation, lib, fetchurl, fetchsvn
, pkgconfig, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook
, qtbase, qtimageformats, gtk3, libsForQt5, enchant2, lz4, xxHash
, dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3
@ -63,8 +63,6 @@ mkDerivation rec {
"-DDESKTOP_APP_DISABLE_WEBRTC_INTEGRATION=ON"
#"-DDESKTOP_APP_SPECIAL_TARGET=\"\"" # TODO: Error when set to "": Bad special target '""'
"-DTDESKTOP_LAUNCHER_BASENAME=telegramdesktop" # Note: This is the default
] ++ optionals stdenv.isLinux [ # TODO: Remove workaround once #94905 is resolved:
"-DCMAKE_OSX_ARCHITECTURES="
];
# Note: The following packages could be packaged system-wide, but it's