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.

Sign up for GitHub

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

homebrew: use mas from Nixpkgs #1329

Merged
merged 1 commit into from
Feb 10, 2025
Merged

homebrew: use mas from Nixpkgs #1329

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 3 additions & 6 deletions modules/homebrew.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,9 +708,6 @@ in
description = ''
Applications to install from Mac App Store using {command}`mas`.

When this option is used, `"mas"` is automatically added to
[](#opt-homebrew.brews).

Note that you need to be signed into the Mac App Store for {command}`mas` to
successfully install and upgrade applications, and that unfortunately apps removed from this
option will not be uninstalled automatically even if
Expand Down Expand Up @@ -768,8 +765,7 @@ in
];

homebrew.brews =
optional (cfg.masApps != { }) "mas"
++ optional (cfg.whalebrews != [ ]) "whalebrew";
optional (cfg.whalebrews != [ ]) "whalebrew";

homebrew.brewfile =
"# Created by `nix-darwin`'s `homebrew` module\n\n"
Expand All @@ -789,7 +785,8 @@ in
# Homebrew Bundle
echo >&2 "Homebrew bundle..."
if [ -f "${cfg.brewPrefix}/brew" ]; then
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don’t think this is very likely, but what if brew is not in brewPrefix1? Then mas won’t be added to the PATH.

Footnotes

  1. If brew isn’t on the PATH, then there are bigger issues, but it could just be in a non-standard location, but still on the PATH. ↩

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The else condition is just an error message, so that seems okay?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whoops – I overlooked that. Yeah, totally fine, sorry.

PATH="${cfg.brewPrefix}":$PATH ${cfg.onActivation.brewBundleCmd}
PATH="${cfg.brewPrefix}:${lib.makeBinPath [ pkgs.mas ]}:$PATH" \
${cfg.onActivation.brewBundleCmd}
else
echo -e "\e[1;31merror: Homebrew is not installed, skipping...\e[0m" >&2
fi
Expand Down