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

Jump to bottom

[macOS] Add macOS support to Nix #1485

Merged
merged 1 commit into from
Aug 20, 2023
Merged

[macOS] Add macOS support to Nix #1485

merged 1 commit into from
Aug 20, 2023

Conversation

getchoo
Copy link
Member

@getchoo getchoo commented Aug 4, 2023

now that NixOS/nixpkgs#246898 has been merged, i'm bringing these changes into our repo. this will allow for development builds to be easily accessible for all macos users with nix installed, as well as allow them to use our dev shell. this will be a draft until the pr in nixpkgs is merged into our branch of choice, nixos-unstable (you can see if it has been here)

i also added myself to the maintainers meta attribute like in nixpkgs, and made small changes to match the derivation from there a bit better :p

@getchoo getchoo added macOS Issues and PRs related to macOS specifically packaging Issues and PRs related to packaging (CI builds or package managers) backport release-7.x changelog:added A PR that appears under "Added" in the changelog labels Aug 4, 2023
@getchoo
Copy link
Member Author

getchoo commented Aug 4, 2023

brain fart

forgot we aren't doing 7.3 :trollface:

@Scrumplex Scrumplex added this to the 8.0 milestone Aug 4, 2023
@getchoo getchoo marked this pull request as ready for review August 5, 2023 05:55
@getchoo
feat(nix): add darwin support
eeb5fdb 
Signed-off-by: seth <getchoo@tuta.io>
@getchoo
Copy link
Member Author

getchoo commented Aug 6, 2023

dropped the lockfile update commit since #1493 was merged

@Scrumplex Scrumplex changed the title Add support for MacOS in Nix flake [macOS] Add macOS support to Nix Aug 16, 2023
Trial97
Trial97 approved these changes Aug 20, 2023
View reviewed changes
Copy link
Member

@Trial97 Trial97 left a comment

Choose a reason for hiding this comment

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

I do not use either mac or nix, but this lgtm.
It only added some dependencies for mac and formated the file :D

@Scrumplex Scrumplex merged commit 5c95448 into PrismLauncher:develop Aug 20, 2023
32 checks passed
evan-goode added a commit to unmojang/PollyMC that referenced this pull request Nov 15, 2023
@evan-goode
Merge tag '8.0' into unmojang-8.0
c6b48a5 
Upstream changelog: https://github.com/PrismLauncher/PrismLauncher/releases/tag/8.0

(Imcomplete) list of changes in 8.0 relevant to PollyMC:
- Prism has dropped support for Mojang accounts
  - PrismLauncher/PrismLauncher#1656
  - Added it back to PollyMC primarily since the Mojang authentication
    code is also used for authlib-injector accounts. Some users may also
    still want to be able to log in to Mojang accounts for some reason:
    fn2006#115 (comment),
    even if they do not provide authentication to multiplayer servers.
  - To my surprise, I could still log in to a Mojang account, get its
    skin, and launch the game. Authentication to servers, of course, did
    not work.
  - Tested: logging into authlib-injector, Mojang, and MSA accounts and
    launching the game.
- Prism has added a built-in updater for Windows and Linux that I
  assume provides similar functionality to Sparkle on macOS:
  PrismLauncher/PrismLauncher#1268. There is a
  Launcher_UPDATER_GITHUB_REPO variable in CMakeLists.txt that specifies
  the repo checked by the updater. I have changed this to the PollyMC
  repository, and since PollyMC follows almost the same CI/release
  patterns as Prism Launcher, it might work with PollyMC, too, but I
  have not tested it yet.
- Add macOS support to Nix
  - PrismLauncher/PrismLauncher#1485
  - Untested
- The "PollyMC-Linux-8.0.tar.gz" and similar build artifacts were
  renamed to "PollyMC-Linux-8.0-Qt5.tar.gz" to match their
  "PollyMC-Linux-8.0-Qt6.tar.gz" counterparts.
- Removed Windows MSVC Legacy builds
- Removed Quilt Beacon toggle, the beacon is now always disabled:
  PrismLauncher/PrismLauncher#1547,
  PrismLauncher/meta#23
- Prism removed FTB support in 7.0, but I tested creating an FTB
  instance to make sure it still works in 8.0
evan-goode added a commit to unmojang/PollyMC that referenced this pull request Nov 15, 2023
@evan-goode
Merge tag '8.0' into unmojang-8.0
a2b1ef7 
Upstream changelog: https://github.com/PrismLauncher/PrismLauncher/releases/tag/8.0

(Imcomplete) list of changes in 8.0 relevant to PollyMC:
- Prism has dropped support for Mojang accounts
  - PrismLauncher/PrismLauncher#1656
  - Added it back to PollyMC primarily since the Mojang authentication
    code is also used for authlib-injector accounts. Some users may also
    still want to be able to log in to Mojang accounts for some reason:
    fn2006#115 (comment),
    even if they do not provide authentication to multiplayer servers.
  - To my surprise, I could still log in to a Mojang account, get its
    skin, and launch the game. Authentication to servers, of course, did
    not work.
  - Tested: logging into authlib-injector, Mojang, and MSA accounts and
    launching the game.
- Prism has added a built-in updater for Windows and Linux that I
  assume provides similar functionality to Sparkle on macOS:
  PrismLauncher/PrismLauncher#1268. There is a
  Launcher_UPDATER_GITHUB_REPO variable in CMakeLists.txt that specifies
  the repo checked by the updater. I have changed this to the PollyMC
  repository, and since PollyMC follows almost the same CI/release
  patterns as Prism Launcher, it might work with PollyMC, too, but I
  have not tested it yet.
- Add macOS support to Nix
  - PrismLauncher/PrismLauncher#1485
  - Untested
- The "PollyMC-Linux-8.0.tar.gz" and similar build artifacts were
  renamed to "PollyMC-Linux-8.0-Qt5.tar.gz" to match their
  "PollyMC-Linux-8.0-Qt6.tar.gz" counterparts.
- Removed Windows MSVC Legacy builds
- Removed Quilt Beacon toggle, the beacon is now always disabled:
  PrismLauncher/PrismLauncher#1547,
  PrismLauncher/meta#23
- Prism removed FTB support in 7.0, but I tested creating an FTB
  instance to make sure it still works in 8.0

Signed-off-by: Evan Goode <mail@evangoo.de>
@evan-goode evan-goode mentioned this pull request Nov 15, 2023
Merged
evan-goode added a commit to unmojang/PollyMC that referenced this pull request Nov 15, 2023
@evan-goode
Merge tag '8.0' into unmojang-8.0
0ce41ee 
Upstream changelog: https://github.com/PrismLauncher/PrismLauncher/releases/tag/8.0

(Imcomplete) list of changes in 8.0 relevant to PollyMC:
- Prism has dropped support for Mojang accounts
  - PrismLauncher/PrismLauncher#1656
  - Added it back to PollyMC primarily since the Mojang authentication
    code is also used for authlib-injector accounts. Some users may also
    still want to be able to log in to Mojang accounts for some reason:
    fn2006#115 (comment),
    even if they do not provide authentication to multiplayer servers.
  - To my surprise, I could still log in to a Mojang account, get its
    skin, and launch the game. Authentication to servers, of course, did
    not work.
  - Tested: logging into authlib-injector, Mojang, and MSA accounts and
    launching the game.
- Prism has added a built-in updater for Windows and Linux that I assume
  provides similar functionality to Sparkle on macOS:
  PrismLauncher/PrismLauncher#1268. There is a
  Launcher_UPDATER_GITHUB_REPO variable in CMakeLists.txt that specifies
  the repo checked by the updater. I have changed this to the PollyMC
  repository, and since PollyMC follows almost the same CI/release
  patterns as Prism Launcher, it might work with PollyMC, too, but I
  have not tested it yet.
- Add macOS support to Nix
  - PrismLauncher/PrismLauncher#1485
  - Untested
- The "PollyMC-Linux-8.0.tar.gz" and similar build artifacts were
  renamed to "PollyMC-Linux-8.0-Qt5.tar.gz" to match their
  "PollyMC-Linux-8.0-Qt6.tar.gz" counterparts.
- Removed Windows MSVC Legacy builds
- Removed Quilt Beacon toggle, the beacon is now always disabled:
  PrismLauncher/PrismLauncher#1547,
  PrismLauncher/meta#23
- Prism removed FTB support in 7.0, but I tested creating an FTB
  instance to make sure it still works in 8.0

Signed-off-by: Evan Goode <mail@evangoo.de>
evan-goode added a commit to unmojang/PollyMC that referenced this pull request Nov 15, 2023
@evan-goode
Merge tag '8.0' into unmojang-8.0
9430026 
Upstream changelog: https://github.com/PrismLauncher/PrismLauncher/releases/tag/8.0

(Imcomplete) list of changes in 8.0 relevant to PollyMC:
- Prism has dropped support for Mojang accounts
  - PrismLauncher/PrismLauncher#1656
  - Added it back to PollyMC primarily since the Mojang authentication
    code is also used for authlib-injector accounts. Some users may also
    still want to be able to log in to Mojang accounts for some reason:
    fn2006#115 (comment),
    even if they do not provide authentication to multiplayer servers.
  - To my surprise, I could still log in to a Mojang account, get its
    skin, and launch the game. Authentication to servers, of course, did
    not work.
  - Tested: logging into authlib-injector, Mojang, and MSA accounts and
    launching the game.
- Prism has added a built-in updater for Windows and Linux that I assume
  provides similar functionality to Sparkle on macOS:
  PrismLauncher/PrismLauncher#1268. There is a
  Launcher_UPDATER_GITHUB_REPO variable in CMakeLists.txt that specifies
  the repo checked by the updater. I have changed this to the PollyMC
  repository, and since PollyMC follows almost the same CI/release
  patterns as Prism Launcher, it might work with PollyMC, too, but I
  have not tested it yet.
- Add macOS support to Nix
  - PrismLauncher/PrismLauncher#1485
  - Untested
- The "PollyMC-Linux-8.0.tar.gz" and similar build artifacts were
  renamed to "PollyMC-Linux-8.0-Qt5.tar.gz" to match their
  "PollyMC-Linux-8.0-Qt6.tar.gz" counterparts.
- Removed Windows MSVC Legacy builds
- Removed Quilt Beacon toggle, the beacon is now always disabled:
  PrismLauncher/PrismLauncher#1547,
  PrismLauncher/meta#23
- Prism removed FTB support in 7.0, but I tested creating an FTB
  instance to make sure it still works in 8.0

Signed-off-by: Evan Goode <mail@evangoo.de>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Scrumplex Scrumplex Scrumplex approved these changes

@Trial97 Trial97 Trial97 approved these changes

Assignees
No one assigned
Labels
changelog:added A PR that appears under "Added" in the changelog macOS Issues and PRs related to macOS specifically packaging Issues and PRs related to packaging (CI builds or package managers)
Projects
None yet
Milestone
8.0
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@getchoo @Scrumplex @Trial97