diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-03-16 15:00:54 +0200 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-03-16 15:00:54 +0200 |
| commit | 7db54bdcb10ef4a7440e776f93547c41cab29d84 (patch) | |
| tree | c6b4bdc754dba140eef7f10f764013181164e85a /pkgs | |
| parent | c7bf74ae687437f916c5f1f2a65f44cc6bfeeecc (diff) | |
| download | nixpkgs-7db54bdcb10ef4a7440e776f93547c41cab29d84.tar nixpkgs-7db54bdcb10ef4a7440e776f93547c41cab29d84.tar.gz nixpkgs-7db54bdcb10ef4a7440e776f93547c41cab29d84.tar.bz2 nixpkgs-7db54bdcb10ef4a7440e776f93547c41cab29d84.tar.lz nixpkgs-7db54bdcb10ef4a7440e776f93547c41cab29d84.tar.xz nixpkgs-7db54bdcb10ef4a7440e776f93547c41cab29d84.tar.zst nixpkgs-7db54bdcb10ef4a7440e776f93547c41cab29d84.zip | |
kotatogram-desktop: unbreak on aarch64-linux
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index 6e3a9e54f0d..1d42bba30d7 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -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; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f6df133869b..3d2450d33ac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 |