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

refactor(nix): synchronize changes from nixpkgs #492

Merged
merged 1 commit into from Nov 26, 2022
Merged

refactor(nix): synchronize changes from nixpkgs #492

merged 1 commit into from Nov 26, 2022

Conversation

Scrumplex
Copy link
Member

Updates the nix derivation to mostly match the one in nixpkgs.

See https://github.com/NixOS/nixpkgs/blob/master/pkgs/games/prismlauncher/default.nix

@Scrumplex
refactor(nix): synchronize changes from nixpkgs
f601135 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
@Scrumplex Scrumplex added this to the 6.0 milestone Nov 20, 2022
@Scrumplex Scrumplex added packaging Issues and PRs related to packaging (CI builds or package managers) Linux Issues and PRs related to Linux specifically labels Nov 20, 2022
@Scrumplex
Copy link
Member Author

CC @Minion3665

@Scrumplex Scrumplex mentioned this pull request Nov 20, 2022
Merged
Minion3665
Minion3665 approved these changes Nov 20, 2022
View reviewed changes
Copy link
Contributor

@Minion3665 Minion3665 left a comment

Choose a reason for hiding this comment

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

Looks good to me and builds & runs fine

@DioEgizio
Copy link
Member

why was ninja removed?

@Scrumplex
Copy link
Member Author

Scrumplex commented Nov 21, 2022 •
edited

why was ninja removed?

It doesn't matter much anyway. It wasn't used in nixpkgs, so I removed it here as well

@DioEgizio
Copy link
Member

I mean it makes building considerably faster though

@Scrumplex
Copy link
Member Author

I mean it makes building considerably faster though

is it? IIRC nix already sets -jX by default so it shouldn't matter much

@DioEgizio
Copy link
Member

ninja still makes it faster, it's not just make with -jX by default

@Minion3665
Copy link
Contributor

We should likely have parity between here and nixpkgs, we could consider adding ninja to nixpkgs instead of removing it from here if that is preferred

@Scrumplex
Copy link
Member Author

Looking at this benchmark it doesn't seem to matter much for a project the size of Prism Launcher (~1600 .cpp/.h/.ui files)

DioEgizio
DioEgizio approved these changes Nov 26, 2022
View reviewed changes
Copy link
Member

@DioEgizio DioEgizio left a comment

Choose a reason for hiding this comment

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

I guess for now it's fine

@Scrumplex Scrumplex merged commit 80ff0b1 into PrismLauncher:develop Nov 26, 2022
@Scrumplex Scrumplex deleted the update-nix branch November 26, 2022 13:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@flowln flowln flowln approved these changes

@Minion3665 Minion3665 Minion3665 approved these changes

@DioEgizio DioEgizio DioEgizio approved these changes

Assignees
No one assigned
Labels
Linux Issues and PRs related to Linux specifically packaging Issues and PRs related to packaging (CI builds or package managers)
Projects
None yet
Milestone
6.0
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@Scrumplex @DioEgizio @Minion3665 @flowln