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.

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

dolphin-emu[-primehack]: cleanup, move to by-name #390208

Merged
merged 6 commits into from
Mar 20, 2025

Conversation

GaetanLepage
Copy link
Contributor

@GaetanLepage GaetanLepage commented Mar 15, 2025

Things done

  • dolphin-emu: format
  • dolphin-emu: move to by-name
  • dolphin-emu: cleanup, modernize
  • dolphin-emu-primehack: move to by-name
  • dolphin-emu-primehack: cleanup, modernize
  • dolphin-emu-primehack: do not add darwin-only dependencies when building for linux

--> To be reviewed commit by commit <--

cc @pbsds, @Madouura

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Mar 15, 2025
@nix-owners nix-owners bot requested a review from pbsds March 15, 2025 19:51
@GaetanLepage
Copy link
Contributor Author

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 390208


x86_64-linux

✅ 2 packages built:
  • dolphin-emu
  • dolphin-emu-primehack

aarch64-linux

✅ 2 packages built:
  • dolphin-emu
  • dolphin-emu-primehack

Copy link
Member

@pbsds pbsds left a comment

Choose a reason for hiding this comment

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

The move-to-by-name commit drops a bunch of darwin inputs, including moltenvk which i assume is critical.

The title of 18a9c5a confuses me, please elaborate

@GaetanLepage
Copy link
Contributor Author

GaetanLepage commented Mar 17, 2025

The move-to-by-name commit drops a bunch of darwin inputs, including moltenvk which i assume is critical.

You are right. All the other ones are now provided automatically by stdenv, but not moltenvk. I added it back.

The title of 18a9c5a confuses me, please elaborate

I changed this commit and added the dependencies back. Now they are only added to buildInputs on darwin hosts.

@GaetanLepage
Copy link
Contributor Author

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 390208


x86_64-linux

✅ 2 packages built:
  • dolphin-emu
  • dolphin-emu-primehack

aarch64-linux

✅ 2 packages built:
  • dolphin-emu
  • dolphin-emu-primehack

@pbsds
Copy link
Member

pbsds commented Mar 17, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 390208


x86_64-linux

✅ 2 packages built:
  • dolphin-emu
  • dolphin-emu-primehack

aarch64-linux

✅ 2 packages built:
  • dolphin-emu
  • dolphin-emu-primehack

@GaetanLepage
Copy link
Contributor Author

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 390208


x86_64-linux

✅ 2 packages built:
  • dolphin-emu
  • dolphin-emu-primehack

aarch64-linux

✅ 2 packages built:
  • dolphin-emu
  • dolphin-emu-primehack

@GaetanLepage GaetanLepage requested a review from pbsds March 18, 2025 06:13
@GaetanLepage
Copy link
Contributor Author

@pbsds any additional request?

@pbsds
Copy link
Member

pbsds commented Mar 20, 2025

I assume @Madouura is inactive, :shipit:

@pbsds pbsds merged commit 8a1ea3b into NixOS:master Mar 20, 2025
27 checks passed
@GaetanLepage GaetanLepage deleted the dolphin-emu branch March 20, 2025 07:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants