Skip to content

Commit 142e67c

Browse files
Madman10Kalehander92
authored andcommitted
bugfix(macOS): ruby should be symlinked and not copied 🫩
1 parent 38b183f commit 142e67c

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

non-nix-build/build_in_simple_env.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ bash build_backend_manager.sh
4343
cp "$ROOT_DIR"/resources/electron "$DIST_DIR"/bin/
4444

4545
# The built-in macOS ruby binary is too old and has to be hacked around
46-
cp "$(brew --prefix ruby)/bin/ruby" "$DIST_DIR/bin/ruby"
46+
ln -s "$(brew --prefix ruby)"/bin/ruby "$DIST_DIR"/bin/ruby
4747
cp -Lr "${ROOT_DIR}"/libs/codetracer-ruby-recorder "$DIST_DIR"/
4848
cp "$(which ctags)" "$DIST_DIR"/bin/ctags
4949
cp "$ROOT_DIR"/src/helpers.js "$DIST_DIR"/src/helpers.js

non-nix-build/env.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ pushd ../src/links
8080

8181
[ ! -f bash ] && ln -sf "$(readlink -f "$(which bash)")" bash
8282
[ ! -f node ] && ln -sf "$(readlink -f "$(which node)")" node
83-
[ ! -f ruby ] && ln -sf "$(brew --prefix ruby)/bin/ruby" ruby
83+
[ ! -f ruby ] && ln -sf "$(brew --prefix ruby)"/bin/ruby ruby
8484
[ ! -f nargo ] && ln -sf "$(readlink -f "$(which nargo)")" nargo
8585
[ ! -f electron ] && ln -sf "$(readlink -f "$(which electron)")" electron
8686
popd

src/frontend/index/menu.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ when defined(ctmacos):
2727
if node.kind == MenuFolder:
2828
var items: seq[js] = @[]
2929
for child in node.elements:
30-
if child.menuOs != ord(MenuNodeOSNonMacOS):
30+
if not cast[bool](child.menuOs and ord(MenuNodeOSNonMacOS)) and not cast[bool](child.menuOs and ord(MenuNodeOSHost)):
3131
items.add(menuNodeToItem(child))
3232
if child.isBeforeNextSubGroup:
3333
items.add(js{type: cstring"separator"})

0 commit comments

Comments
 (0)