swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 04:49:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #199598 from avdv/mold-on-aarch64-linux

Browse source 
mold: Unbreak on aarch64-linux
This commit is contained in:
Franz Pletz 2022-11-06 12:31:40 +01:00 committed by GitHub
parent a95e6a731b efa86fc3b0
commit c190f823d5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/tools/mold/default.nix
View file

@ -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);
};
}

5
pkgs/top-level/all-packages.nix
View file

@ -17302,7 +17302,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 { };