From 7cd37990742643121a7abb8307b03df069575a70 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Fri, 15 Apr 2022 07:13:35 +0400 Subject: [PATCH] kotatogram-desktop: use clang*Stdenv instead of llvmPackages_*.*stdenv --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2bb6b6c348b1..e0f80b57c95d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27082,13 +27082,13 @@ with pkgs; # C++20 is required, darwin has Clang 7 by default, aarch64 has gcc 9 by default stdenv = if stdenv.isDarwin - then llvmPackages_12.libcxxStdenv + then clang12Stdenv 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 # functions like __builtin_ffsl by jemalloc when it's built with gcc. - jemalloc = (jemalloc.override { stdenv = llvmPackages.stdenv; }).overrideAttrs(_: { + jemalloc = (jemalloc.override { stdenv = clangStdenv; }).overrideAttrs(_: { # no idea how to fix the tests :( doCheck = false; });