pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #208794 from wegank/tcc-darwin

tinycc: unbreak on x86_64-darwin

authored by Anderson Torres and committed by GitHub 64d2ee50 5e18beea

+7 -2
unified split
+6 -1
pkgs/development/compilers/tinycc/default.nix
··· 78 79 doCheck = true; 80 checkTarget = "test"; 81 82 meta = with lib; { 83 homepage = "https://repo.or.cz/tinycc.git"; ··· 106 license = licenses.lgpl21Only; 107 maintainers = with maintainers; [ joachifm AndersonTorres ]; 108 platforms = platforms.unix; 109 - broken = stdenv.isDarwin; 110 }; 111 } 112 # TODO: more multiple outputs
··· 78 79 doCheck = true; 80 checkTarget = "test"; 81 + # https://www.mail-archive.com/tinycc-devel@nongnu.org/msg10142.html 82 + preCheck = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' 83 + rm tests/tests2/{108,114}* 84 + ''; 85 86 meta = with lib; { 87 homepage = "https://repo.or.cz/tinycc.git"; ··· 110 license = licenses.lgpl21Only; 111 maintainers = with maintainers; [ joachifm AndersonTorres ]; 112 platforms = platforms.unix; 113 + # https://www.mail-archive.com/tinycc-devel@nongnu.org/msg10199.html 114 + broken = stdenv.isDarwin && stdenv.isAarch64; 115 }; 116 } 117 # TODO: more multiple outputs
+1 -1
pkgs/top-level/all-packages.nix
··· 15684 gconf = gnome2.GConf; 15685 }; 15686 15687 - tinycc = callPackage ../development/compilers/tinycc { }; 15688 15689 tinygo = callPackage ../development/compilers/tinygo { 15690 llvmPackages = llvmPackages_14;
··· 15684 gconf = gnome2.GConf; 15685 }; 15686 15687 + tinycc = darwin.apple_sdk_11_0.callPackage ../development/compilers/tinycc { }; 15688 15689 tinygo = callPackage ../development/compilers/tinygo { 15690 llvmPackages = llvmPackages_14;