Skip to content

Commit

Permalink
kotatogram-desktop: unbreak on aarch64-linux
Browse files Browse the repository at this point in the history
  • Loading branch information
wegank committed Mar 16, 2023
1 parent c7bf74a commit 7db54bd
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,6 @@ stdenv.mkDerivation rec {
changelog = "https://github.com/kotatogram/kotatogram-desktop/releases/tag/k{version}";
maintainers = with maintainers; [ ilya-fedin ];
# never built on aarch64-darwin since first introduction in nixpkgs
broken = (stdenv.isDarwin && stdenv.isAarch64) || (stdenv.isLinux && stdenv.isAarch64);
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}
3 changes: 1 addition & 2 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -31094,10 +31094,9 @@ with pkgs;
Carbon AudioToolbox VideoToolbox VideoDecodeAcceleration AVFoundation CoreAudio CoreVideo
CoreMediaIO QuartzCore AppKit CoreWLAN WebKit IOKit GSS MediaPlayer IOSurface Metal MetalKit;

# C++20 is required, aarch64 has gcc 9 by default
stdenv = if stdenv.isDarwin
then darwin.apple_sdk_11_0.stdenv
else if stdenv.isAarch64 then gcc10Stdenv else stdenv;
else stdenv;

# tdesktop has random crashes when jemalloc is built with gcc.
# Apparently, it triggers some bug due to usage of gcc's builtin
Expand Down

0 comments on commit 7db54bd

Please sign in to comment.