ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-17 18:47:57 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #221485 from wegank/kotatogram-desktop-fix

Browse Source 
kotatogram-desktop: unbreak on aarch64-linux
This commit is contained in:
Weijia Wang 2023-03-16 16:40:15 +02:00 committed by GitHub
commit a54102e3ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix
View File

@ -220,6 +220,6 @@ stdenv.mkDerivation rec {
changelog = "https://github.com/kotatogram/kotatogram-desktop/releases/tag/k{version}"; changelog = "https://github.com/kotatogram/kotatogram-desktop/releases/tag/k{version}";
maintainers = with maintainers; [ ilya-fedin ]; maintainers = with maintainers; [ ilya-fedin ];
# never built on aarch64-darwin since first introduction in nixpkgs # 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
pkgs/top-level/all-packages.nix
View File

@ -31094,10 +31094,9 @@ with pkgs;
Carbon AudioToolbox VideoToolbox VideoDecodeAcceleration AVFoundation CoreAudio CoreVideo Carbon AudioToolbox VideoToolbox VideoDecodeAcceleration AVFoundation CoreAudio CoreVideo
CoreMediaIO QuartzCore AppKit CoreWLAN WebKit IOKit GSS MediaPlayer IOSurface Metal MetalKit; 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 stdenv = if stdenv.isDarwin
then darwin.apple_sdk_11_0.stdenv 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. # tdesktop has random crashes when jemalloc is built with gcc.
# Apparently, it triggers some bug due to usage of gcc's builtin # Apparently, it triggers some bug due to usage of gcc's builtin