colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

deno: allow for the build of libtcc.a on darwin

Browse Source 
While the rest of the build is broken libtcc.a actually builds fine on
darwin systems and deno_ffi can link to it and work perfectly fine
This commit is contained in:
06kellyjac 2022-08-31 12:36:48 +01:00
parent 4e427c9df0
commit 817a35be0b
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/development/web/deno/default.nix
View File

@ -15,18 +15,6 @@
, librusty_v8 ? callPackage ./librusty_v8.nix { }
}:
let
libtcc = tinycc.overrideAttrs (oa: {
makeFlags = [ "libtcc.a" ];
# tests want tcc binary
doCheck = false;
outputs = [ "out" ];
installPhase = ''
mkdir -p $out/lib/
mv libtcc.a $out/lib/
'';
});
in
rustPlatform.buildRustPackage rec {
pname = "deno";
version = "1.25.1";
@ -58,6 +46,19 @@ rustPlatform.buildRustPackage rec {
# The deno_ffi package currently needs libtcc.a on linux and macos and will try to compile it at build time
# To avoid this we point it to our copy (dir)
# In the future tinycc will be replaced with asm
libtcc = tinycc.overrideAttrs (oa: {
makeFlags = [ "libtcc.a" ];
# tests want tcc binary
doCheck = false;
outputs = [ "out" ];
installPhase = ''
mkdir -p $out/lib/
mv libtcc.a $out/lib/
'';
# building the whole of tcc on darwin is broken in nixpkgs
# but just building libtcc.a works fine so mark this as unbroken
meta.broken = false;
});
TCC_PATH = "${libtcc}/lib";
# Tests have some inconsistencies between runs with output integration tests
@ -101,6 +102,5 @@ rustPlatform.buildRustPackage rec {
license = licenses.mit;
maintainers = with maintainers; [ jk ];
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
broken = stdenv.isDarwin; # currently fail to build tinycc on darwin in nixpkgs
};
}