Skip to content

kotatogram-desktop: fix build on Darwin after #210062 #211588

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NickCao merged 1 commit into from
Jan 20, 2023
Merged

kotatogram-desktop: fix build on Darwin after #210062 #211588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 3 additions & 10 deletions pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,11 @@ with lib;

let
tg_owt = callPackage ./tg_owt.nix {
abseil-cpp = (abseil-cpp.override {
abseil-cpp = abseil-cpp.override {
# abseil-cpp should use the same compiler
inherit stdenv;
cxxStandard = "20";
}).overrideAttrs (_: {
# https://github.com/NixOS/nixpkgs/issues/130963
NIX_LDFLAGS = optionalString stdenv.isDarwin "-lc++abi";
});
};

# tg_owt should use the same compiler
inherit stdenv;
Expand All @@ -100,8 +97,6 @@ stdenv.mkDerivation rec {
patches = [
./kf594.patch
./shortcuts-binary-path.patch
# let it build with nixpkgs 10.12 sdk
./kotato-10.12-sdk.patch
];

postPatch = optionalString stdenv.isLinux ''
Expand All @@ -112,6 +107,7 @@ stdenv.mkDerivation rec {
substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp \
--replace '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"'
'' + optionalString stdenv.isDarwin ''
sed -i "13i#import <CoreAudio/CoreAudio.h>" Telegram/lib_webrtc/webrtc/mac/webrtc_media_devices_mac.mm
substituteInPlace Telegram/CMakeLists.txt \
--replace 'COMMAND iconutil' 'COMMAND png2icns' \
--replace '--convert icns' "" \
Expand Down Expand Up @@ -189,9 +185,6 @@ stdenv.mkDerivation rec {
libicns
];

# https://github.com/NixOS/nixpkgs/issues/130963
NIX_LDFLAGS = optionalString stdenv.isDarwin "-lc++abi";

enableParallelBuilding = true;

cmakeFlags = [
Expand Down
Loading