Unverified Commit 64d2ee50 authored by Anderson Torres's avatar Anderson Torres Committed by GitHub
Browse files

Merge pull request #208794 from wegank/tcc-darwin 

tinycc: unbreak on x86_64-darwin
parents 5e18beea 9144942a

pkgs/development/compilers/tinycc/default.nix

+6 −1
Original line number Diff line number Diff line
@@ -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

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -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;