zed-editor: fix darwin #329653

niklaskorz · 2024-07-24T13:38:00Z

Description of changes

Fixes #320084.

~~Once zed-industries/zed#13343 lands, building Zed on macOS becomes much easier as we do not have to deal with building a separate Swift library that Zed depends on anymore.~~

As zed-industries/zed#13343 seems to need much longer to implement than I originally anticipated, I updated this PR to disable livekit until this change lands, so we can already go ahead and release darwin support without it, using the same internal fallbacks the Linux version is using.

As this PR is making use of the new pattern for using macOS SDKs, it's targetting staging-next, so merging this PR will have to wait until staging-next has been merged into master (and this PR has been retargetted at master).

Things done

Add a 👍 reaction to pull requests you find important.

niklaskorz · 2024-10-19T21:06:48Z

pkgs/by-name/ze/zed-editor/package.nix

@@ -93,14 +95,23 @@ rustPlatform.buildRustPackage rec {
    repo = "zed";
    rev = "refs/tags/v${version}";
    hash = "sha256-xtSdlzj1AxhJN4aXLJ+Oy51LX4QduLwcuCfK42kthvE=";
-    fetchSubmodules = true;


This seems to have become obsolete for a while now for the Zed repository, so I disabled fetching submodules, but correct me if I'm wrong.

GaetanLepage · 2024-10-19T22:17:07Z

`nixpkgs-review` result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 329653

`x86_64-linux`

✅ 1 package built:

zed-editor

`aarch64-linux`

✅ 1 package built:

zed-editor

`x86_64-darwin`

❌ 1 package failed to build:

zed-editor

`aarch64-darwin`

❌ 1 package failed to build:

zed-editor

niklaskorz · 2024-10-20T07:47:54Z

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 329653

x86_64-linux

✅ 1 package built:

aarch64-linux

✅ 1 package built:

x86_64-darwin

❌ 1 package failed to build:

aarch64-darwin

❌ 1 package failed to build:

Could you provide any logs for the failing builds? As it builds fine on aarch64-darwin here. I'll try x86_64-darwin in a moment.

GaetanLepage · 2024-10-20T08:45:01Z

Could you provide any logs for the failing builds? As it builds fine on aarch64-darwin here. I'll try x86_64-darwin in a moment.

Actually I naively ran the tool and didn't notice that the PR was targetting staging.
I think it failed on darwin because cargo wasn't building.

niklaskorz · 2024-10-20T08:49:03Z

Could you provide any logs for the failing builds? As it builds fine on aarch64-darwin here. I'll try x86_64-darwin in a moment.

Actually I naively ran the tool and didn't notice that the PR was targetting staging. I think it failed on darwin because cargo wasn't building.

I see! Yeah, it takes a good while because Rust and Cargo 1.82 are not cached yet on staging-next, but both should build fine :)

I'm still compiling x86_64-darwin:

┏━ Dependency Graph:
┃    ┌─ ⏸ xim-parser-0.2.1-x86_64-darwin waiting for 1 ⏵
┃    │           ┌─ ⏸ cargo-build-hook.sh-x86_64-darwin waiting for 1 ⏵
┃    │           │           ┌─ ⏵ llvm-18.1.8-x86_64-darwin (buildPhase) ⏱ 15m39s
┃    │           │        ┌─ ⏸ rustc-1.82.0-x86_64-darwin
┃    │           │     ┌─ ⏸ rustc-wrapper-1.82.0-x86_64-darwin
┃    │           │  ┌─ ⏸ cargo-1.82.0-x86_64-darwin
┃    │           ├─ ⏸ cargo-check-hook.sh-x86_64-darwin
┃    │        ┌─ ⏸ cargo-auditable-0.6.2-x86_64-darwin
┃    │     ┌─ ⏸ auditable-cargo-bootstrap-1.81.0-x86_64-darwin
┃    │  ┌─ ⏸ cargo-1.82.0-x86_64-darwin
┃    ├─ ⏸ xim-ctext-0.3.0-x86_64-darwin
┃ ┌─ ⏸ cargo-vendor-dir-x86_64-darwin
┃ ⏸ zed-editor-0.157.5-x86_64-darwin

Edit: Took quite a while to compile through Rosetta, but finished now.

┃ ✔ zed-editor-0.157.5-x86_64-darwin ⏱ 1h3m58s
┣━━━ Builds            │ Downloads          │ Host
┃        │ ✔ 330 │     │     │        │     │ localhost
┃        │       │     │     │ ↓ 1308 │     │ https://cache.nixos.org
┗━ ∑ ⏵ 0 │ ✔ 330 │ ⏸ 0 │ ↓ 0 │ ↓ 1308 │ ⏸ 0 │ Finished at 13:55:58 after 3h24m47s

$ file result/Applications/Zed.app/Contents/MacOS/zed
result/Applications/Zed.app/Contents/MacOS/zed: Mach-O 64-bit executable x86_64

GaetanLepage · 2024-10-20T20:07:29Z

Good job on this @niklaskorz !
Do you want to merge this against staging-next or wait that it lands on master first and then merge it on master ?

jansol · 2024-10-20T20:09:39Z

pkgs/by-name/ze/zed-editor/package.nix

@@ -191,6 +195,9 @@ rustPlatform.buildRustPackage rec {
    ZED_UPDATE_EXPLANATION = "zed has been installed using nix. Auto-updates have thus been disabled.";


Suggested change

ZED_UPDATE_EXPLANATION = "zed has been installed using nix. Auto-updates have thus been disabled.";

ZED_UPDATE_EXPLANATION = "Zed has been installed using Nix. Auto-updates have thus been disabled.";

Unrelated to this PR, but I agree that looks nicer, will add it as a separate commit :)

Yeah, hence not an actual review :D It just caught my eye on the above screenshots

niklaskorz · 2024-10-20T20:21:13Z

Good job on this @niklaskorz ! Do you want to merge this against staging-next or wait that it lands on master first and then merge it on master ?

I am fine with both. On the "Nix on macOS" Matrix room I asked what the usual procedure was and @khaneliman answered:

If there's a dependency on something in staging/staging-next I don't think it's necessarily wrong to target them if you don't want to wait until it propagates down. I think there's a chance stuff gets ripped out or reverted in those branches, though so it might make sense to wait until it gets to master. Unless, you're more involved in the staging flow.

But I don't think there is any chance at this point that the new Apple SDK and darwin minimum version hook get removed from staging-next, as they were a long time coming before they were merged into staging. And these are the only two things from staging-next this PR relies on. Also @emilazy is already aware of the NIX_CFLAGS_COMPILE workaround in this PR for the currently disabled -isysroot, so she knows where to find and remove it once #349555 progresses.

GaetanLepage · 2024-10-20T20:24:43Z

Good job on this @niklaskorz ! Do you want to merge this against staging-next or wait that it lands on master first and then merge it on master ?

I am fine with both. On the "Nix on macOS" Matrix room I asked what the usual procedure was and @khaneliman answered:

If there's a dependency on something in staging/staging-next I don't think it's necessarily wrong to target them if you don't want to wait until it propagates down. I think there's a chance stuff gets ripped out or reverted in those branches, though so it might make sense to wait until it gets to master. Unless, you're more involved in the staging flow.

But I don't think there is any chance at this point that the new Apple SDK and darwin minimum version hook get removed from staging-next, as they were a long time coming before they were merged into staging. And these are the only two things from staging-next this PR relies on. Also @emilazy is already aware of the NIX_CFLAGS_COMPILE workaround in this PR for the currently disabled -isysroot, so she knows where to find and remove it once #349555 progresses.

Ok, let's go for it then :)

nixos-discourse · 2024-10-31T14:27:03Z

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/title-the-darwin-sdks-have-been-updated/55295/1

niklaskorz changed the base branch from master to staging-next July 24, 2024 13:38

ofborg bot requested a review from GaetanLepage October 18, 2024 15:55

ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Oct 18, 2024

niklaskorz force-pushed the zed-darwin branch 2 times, most recently from 3d7a223 to b988f96 Compare October 18, 2024 16:40

zed-editor: fix darwin

d79ec5e

niklaskorz force-pushed the zed-darwin branch from b988f96 to d79ec5e Compare October 19, 2024 20:58

niklaskorz marked this pull request as ready for review October 19, 2024 21:03

niklaskorz commented Oct 19, 2024

View reviewed changes

jansol reviewed Oct 20, 2024

View reviewed changes

zed-editor: change auto-update message

1d4e138

GaetanLepage approved these changes Oct 20, 2024

View reviewed changes

jansol approved these changes Oct 20, 2024

View reviewed changes

tymscar approved these changes Oct 20, 2024

View reviewed changes

ofborg bot requested a review from GaetanLepage October 20, 2024 22:30

adamcstephens merged commit 67d8538 into NixOS:staging-next Oct 21, 2024
27 of 28 checks passed

This was referenced Oct 24, 2024

Another call for Darwin maintainers #323144

Open

zed-editor: 0.158.1 -> 0.158.2 #350993

Merged

niklaskorz deleted the zed-darwin branch December 20, 2024 18:33

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

zed-editor: fix darwin #329653

zed-editor: fix darwin #329653

niklaskorz commented Jul 24, 2024 •

edited

Loading

niklaskorz Oct 19, 2024 •

edited

Loading

GaetanLepage commented Oct 19, 2024

niklaskorz commented Oct 20, 2024

`nixpkgs-review` result

`x86_64-linux`

`aarch64-linux`

`x86_64-darwin`

`aarch64-darwin`

GaetanLepage commented Oct 20, 2024

niklaskorz commented Oct 20, 2024 •

edited

Loading

GaetanLepage commented Oct 20, 2024

jansol Oct 20, 2024 •

edited

Loading

niklaskorz Oct 20, 2024

jansol Oct 20, 2024

niklaskorz commented Oct 20, 2024 •

edited

Loading

GaetanLepage commented Oct 20, 2024

nixos-discourse commented Oct 31, 2024

		@@ -191,6 +195,9 @@ rustPlatform.buildRustPackage rec {
		ZED_UPDATE_EXPLANATION = "zed has been installed using nix. Auto-updates have thus been disabled.";

zed-editor: fix darwin #329653

zed-editor: fix darwin #329653

Conversation

niklaskorz commented Jul 24, 2024 • edited Loading

Description of changes

Things done

niklaskorz Oct 19, 2024 • edited Loading

Choose a reason for hiding this comment

GaetanLepage commented Oct 19, 2024

nixpkgs-review result

x86_64-linux

aarch64-linux

x86_64-darwin

aarch64-darwin

niklaskorz commented Oct 20, 2024

nixpkgs-review result

x86_64-linux

aarch64-linux

x86_64-darwin

aarch64-darwin

GaetanLepage commented Oct 20, 2024

niklaskorz commented Oct 20, 2024 • edited Loading

GaetanLepage commented Oct 20, 2024

jansol Oct 20, 2024 • edited Loading

Choose a reason for hiding this comment

niklaskorz Oct 20, 2024

Choose a reason for hiding this comment

jansol Oct 20, 2024

Choose a reason for hiding this comment

niklaskorz commented Oct 20, 2024 • edited Loading

GaetanLepage commented Oct 20, 2024

nixos-discourse commented Oct 31, 2024

niklaskorz commented Jul 24, 2024 •

edited

Loading

niklaskorz Oct 19, 2024 •

edited

Loading

`nixpkgs-review` result

`x86_64-linux`

`aarch64-linux`

`x86_64-darwin`

`aarch64-darwin`

`nixpkgs-review` result

`x86_64-linux`

`aarch64-linux`

`x86_64-darwin`

`aarch64-darwin`

niklaskorz commented Oct 20, 2024 •

edited

Loading

jansol Oct 20, 2024 •

edited

Loading

niklaskorz commented Oct 20, 2024 •

edited

Loading