Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: build release on macOS 14 #263

Merged
merged 1 commit into from
Oct 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .rtx.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[tools]
erlang = "26.0.2"
elixir = "1.15.5-otp-26"
zig = "0.10.0"
zig = "0.11.0"
18 changes: 10 additions & 8 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@
erlang = beamPackages.erlang;
elixir = beamPackages.elixir_1_15;

nativeBuildInputs = [ pkgs.xz pkgs.zig_0_10 pkgs._7zz ];
nativeBuildInputs = [ pkgs.xz pkgs.zig_0_11 pkgs._7zz ];

mixFodDeps = beamPackages.fetchMixDeps {
inherit src version;
pname = "${pname}-deps";
hash = "sha256-sRve0L7qFw5vEsespIXVg4loSej+oLO1ewdmT6qGExw=";
hash = "sha256-lPcGbMRpW1eweYXXe35ew+/NnDZWNec0heikUBw9tOY=";
};

preConfigure = ''
Expand All @@ -83,14 +83,16 @@
''
else "";

postInstall = ''
chmod +x ./burrito_out/*
cp -r ./burrito_out "$out"
postInstall =
if system == "x86_64-linux" then ''
chmod +x ./burrito_out/*
cp -r ./burrito_out "$out"

if [ "${system}" == "x86_64-linux" ]; then
patchelf --set-interpreter ${pkgs.glibc}/lib/ld-linux-x86-64.so.2 "$out/burrito_out/next_ls_linux_amd64"
fi
'';
'' else ''
chmod +x ./burrito_out/*
cp -r ./burrito_out "$out"
'';
};
in
{
Expand Down
2 changes: 1 addition & 1 deletion mix.lock
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
%{
"burrito": {:git, "https://github.com/burrito-elixir/burrito.git", "a86857636eaba9a7fa179fd970ed6cf82e9e7d59", []},
"burrito": {:git, "https://github.com/burrito-elixir/burrito.git", "f929e40cdcb35cc40a748fd69f6d28e32f992e46", []},
"bypass": {:hex, :bypass, "2.1.0", "909782781bf8e20ee86a9cabde36b259d44af8b9f38756173e8f5e2e1fabb9b1", [:mix], [{:plug, "~> 1.7", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.0", [hex: :plug_cowboy, repo: "hexpm", optional: false]}, {:ranch, "~> 1.3", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "d9b5df8fa5b7a6efa08384e9bbecfe4ce61c77d28a4282f79e02f1ef78d96b80"},
"castore": {:hex, :castore, "1.0.3", "7130ba6d24c8424014194676d608cb989f62ef8039efd50ff4b3f33286d06db8", [:mix], [], "hexpm", "680ab01ef5d15b161ed6a95449fac5c6b8f60055677a8e79acf01b27baa4390b"},
"cc_precompiler": {:hex, :cc_precompiler, "0.1.8", "933a5f4da3b19ee56539a076076ce4d7716d64efc8db46fd066996a7e46e2bfd", [:mix], [{:elixir_make, "~> 0.7.3", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "176bdf4366956e456bf761b54ad70bc4103d0269ca9558fd7cee93d1b3f116db"},
Expand Down
Loading