diff options
| author | Ilya Fedin <fedin-ilja2010@ya.ru> | 2021-12-05 09:40:46 +0400 |
|---|---|---|
| committer | Ilya Fedin <fedin-ilja2010@ya.ru> | 2022-03-17 02:26:24 +0400 |
| commit | 1a8e99e7f84d5e1047d7c92d8f4f8a52c86cf442 (patch) | |
| tree | 5d1903bd9660bde48ad14cd0ee236e296f49733e /pkgs/top-level/all-packages.nix | |
| parent | d3367563ef18942b88bbe057e4cd557d2319e01b (diff) | |
| download | nixpkgs-1a8e99e7f84d5e1047d7c92d8f4f8a52c86cf442.tar nixpkgs-1a8e99e7f84d5e1047d7c92d8f4f8a52c86cf442.tar.gz nixpkgs-1a8e99e7f84d5e1047d7c92d8f4f8a52c86cf442.tar.bz2 nixpkgs-1a8e99e7f84d5e1047d7c92d8f4f8a52c86cf442.tar.lz nixpkgs-1a8e99e7f84d5e1047d7c92d8f4f8a52c86cf442.tar.xz nixpkgs-1a8e99e7f84d5e1047d7c92d8f4f8a52c86cf442.tar.zst nixpkgs-1a8e99e7f84d5e1047d7c92d8f4f8a52c86cf442.zip | |
kotatogram-desktop: add Darwin support
tdesktop and kotatogram both have macos builds, so it shouldn't be hard to make them available in nixpkgs
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 26d1a21eecc..df60f93a920 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26761,9 +26761,17 @@ with pkgs; kooha = callPackage ../applications/video/kooha { }; - kotatogram-desktop = libsForQt5.callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { - # C++20 is required, aarch64 has gcc 9 by default - stdenv = if stdenv.isAarch64 then gcc10Stdenv else stdenv; + # Qt 5.15 is not default on mac, tdesktop requires 5.15 (and kotatogram subsequently) + kotatogram-desktop = libsForQt515.callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { + inherit (darwin.apple_sdk.frameworks) Cocoa CoreFoundation CoreServices CoreText CoreGraphics + CoreMedia OpenGL AudioUnit ApplicationServices Foundation AGL Security SystemConfiguration + Carbon AudioToolbox VideoToolbox VideoDecodeAcceleration AVFoundation CoreAudio CoreVideo + CoreMediaIO QuartzCore AppKit CoreWLAN WebKit IOKit GSS MediaPlayer IOSurface Metal MetalKit; + + # C++20 is required, darwin has Clang 7 by default, aarch64 has gcc 9 by default + stdenv = if stdenv.isDarwin + then llvmPackages_12.libcxxStdenv + else if stdenv.isAarch64 then gcc10Stdenv else stdenv; # tdesktop has random crashes when jemalloc is built with gcc. # Apparently, it triggers some bug due to usage of gcc's builtin |