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

duckstation: init at unstable-2020-12-28 #107878

Merged
merged 1 commit into from Dec 30, 2020
Merged

duckstation: init at unstable-2020-12-28 #107878

merged 1 commit into from Dec 30, 2020

Conversation

guibou
Copy link
Contributor

@guibou guibou commented Dec 29, 2020

Motivation for this change

duckstation is a nice playstation one emulator with more features than pcsxr or epsxe available in nixpkgs.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions (with OpenGL fixs)
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

prusnak
prusnak requested changes Dec 29, 2020
View reviewed changes
Copy link
Member

@prusnak prusnak left a comment

Choose a reason for hiding this comment

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

Left some suggestions

pkgs/misc/emulators/duckstation/default.nix Outdated Show resolved Hide resolved
pkgs/misc/emulators/duckstation/default.nix Outdated Show resolved Hide resolved
pkgs/misc/emulators/duckstation/default.nix Outdated Show resolved Hide resolved
pkgs/misc/emulators/duckstation/default.nix Outdated Show resolved Hide resolved
@prusnak
Copy link
Member

prusnak commented Dec 29, 2020 •
edited

Please also squash all the commits into one once your are done and rewrite the final commit message to read duckstation: init at unstable-2020-12-28

@guibou guibou force-pushed the duckstation branch 2 times, most recently from 92e48d4 to 925eebe Compare December 29, 2020 12:58
@guibou guibou changed the title duckstation: init at commit dfa36e0 duckstation: init at unstable-2020-12-28 Dec 29, 2020
@guibou
Copy link
Contributor Author

guibou commented Dec 29, 2020

@prusnak Done. Thank you.

@aanderse
Copy link
Member

You might consider opening an issue upstream to replace gtk2 because it isn't supported anymore.

@prusnak
Copy link
Member

prusnak commented Dec 29, 2020 •
edited

You might consider opening an issue upstream to replace gtk2 because it isn't supported anymore.

It seems the UI is written in Qt, they use GTK2 only for the native file-selector dialog. 🤷

We might be able to patch that out and use Qt file-selector dialog instead, but I am unsure this will be accepted by upstream.
However, I don't think this should be a blocker of letting this PR in ATM.

@guibou
Copy link
Contributor Author

guibou commented Dec 29, 2020

nativefiledialog also support gtk3, but that's not the one packaged with the program. Also, it is only used with the SDL interface.

It may be trivial to split the outputs for the sdl and qt binaries, this way gtk2 will be pulled only for the SDL interface.

@guibou
Copy link
Contributor Author

guibou commented Dec 29, 2020

Actually, I've just experimented with a gtk3 patch. I'm confirming that it works and update this PR + upstream PR.

guibou added a commit to guibou/duckstation that referenced this pull request Dec 29, 2020
@guibou
Use gtk3 for nativefiledialog
f30addc 
Rational: gtk2 is not maintained anymore and the change was simple.

- Update of nativefiledialog/CMakeLists.txt in order to detect and use
  gtk3
- Updated a few files referencing gtk2, especially:
  - github workflow: I tested that the apt-get update works on ubuntu
    18.03 in a docker container
  - Readme.

This was tested in the following nixpkgs PR: NixOS/nixpkgs#107878
@guibou guibou mentioned this pull request Dec 29, 2020
Merged
@guibou
Copy link
Contributor Author

guibou commented Dec 29, 2020

Upstream PR: stenzek/duckstation#1344

@guibou guibou requested a review from prusnak December 29, 2020 14:38
prusnak
prusnak requested changes Dec 29, 2020
View reviewed changes
pkgs/misc/emulators/duckstation/default.nix Outdated Show resolved Hide resolved
pkgs/misc/emulators/duckstation/default.nix Outdated Show resolved Hide resolved
pkgs/misc/emulators/duckstation/default.nix Outdated Show resolved Hide resolved
pkgs/misc/emulators/duckstation/default.nix Outdated Show resolved Hide resolved
@guibou
Copy link
Contributor Author

guibou commented Dec 29, 2020

@prusnak I addressed your last batch of comment. Thank you for the time you take to improve the quality of my PR.

@guibou guibou requested a review from prusnak December 29, 2020 17:30
prusnak
prusnak approved these changes Dec 29, 2020
View reviewed changes
Copy link
Member

@prusnak prusnak left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@guibou
Copy link
Contributor Author

guibou commented Dec 29, 2020

@zimbatm @flokli summoning a friend with merge right. ;)

@zimbatm
Copy link
Member

zimbatm commented Dec 30, 2020

Result of nixpkgs-review pr 107878 run on x86_64-linux 1

1 package built:
  • duckstation

@zimbatm zimbatm merged commit 0c7b63e into NixOS:master Dec 30, 2020
@guibou guibou deleted the duckstation branch December 30, 2020 08:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@prusnak prusnak prusnak approved these changes

Assignees
No one assigned
Labels
8.has: package (new) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 10.rebuild-linux: 1 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@guibou @prusnak @aanderse @zimbatm