b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #208794 from wegank/tcc-darwin

Browse source 
tinycc: unbreak on x86_64-darwin
This commit is contained in:
Anderson Torres 2023-01-02 22:19:27 -03:00 committed by GitHub
parent 5e18beea49 9144942aa3
commit 64d2ee501c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/development/compilers/tinycc/default.nix
View file

@ -78,6 +78,10 @@ stdenv.mkDerivation rec {
doCheck = true;
checkTarget = "test";
# https://www.mail-archive.com/tinycc-devel@nongnu.org/msg10142.html
preCheck = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) ''
rm tests/tests2/{108,114}*
'';
meta = with lib; {
homepage = "https://repo.or.cz/tinycc.git";
@ -106,7 +110,8 @@ stdenv.mkDerivation rec {
license = licenses.lgpl21Only;
maintainers = with maintainers; [ joachifm AndersonTorres ];
platforms = platforms.unix;
broken = stdenv.isDarwin;
# https://www.mail-archive.com/tinycc-devel@nongnu.org/msg10199.html
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}
# TODO: more multiple outputs

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

@ -15684,7 +15684,7 @@ with pkgs;
gconf = gnome2.GConf;
};
tinycc = callPackage ../development/compilers/tinycc { };
tinycc = darwin.apple_sdk_11_0.callPackage ../development/compilers/tinycc { };
tinygo = callPackage ../development/compilers/tinygo {
llvmPackages = llvmPackages_14;