From efa86fc3b0daa9782d7bd1a2e25d52206be94100 Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Sat, 5 Nov 2022 00:56:56 +0100 Subject: [PATCH] mold: Unbreak on aarch64-linux The default stdenv C++ compiler / library on this platform is too old to support mold's C++20 code base. --- pkgs/development/tools/mold/default.nix | 2 -- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/mold/default.nix b/pkgs/development/tools/mold/default.nix index 76b0f919b6ce..299c1204d1f1 100644 --- a/pkgs/development/tools/mold/default.nix +++ b/pkgs/development/tools/mold/default.nix @@ -48,7 +48,5 @@ stdenv.mkDerivation rec { license = licenses.agpl3Plus; maintainers = with maintainers; [ azahi nitsky ]; platforms = platforms.unix; - # https://github.com/NixOS/nixpkgs/pull/189712#issuecomment-1237791234 - broken = (stdenv.isLinux && stdenv.isAarch64); }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bd331840e524..06e186c9a9f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16984,7 +16984,10 @@ with pkgs; modd = callPackage ../development/tools/modd { }; mold = callPackage ../development/tools/mold { - inherit (llvmPackages) stdenv; + # C++20 is required, aarch64-linux has gcc 9 by default + stdenv = if stdenv.isLinux && stdenv.isAarch64 + then llvmPackages_12.libcxxStdenv + else llvmPackages.stdenv; }; msgpack-tools = callPackage ../development/tools/msgpack-tools { };