Skip to content

glfw-minecraft: merge glfw-wayland-minecraft into glfw - #310073

Merged
jopejoe1 merged 3 commits into
NixOS:masterfrom
Scrumplex:pkgs/glfw-wayland-minecraft/refactor
Sep 2, 2024
Merged

glfw-minecraft: merge glfw-wayland-minecraft into glfw#310073
jopejoe1 merged 3 commits into
NixOS:masterfrom
Scrumplex:pkgs/glfw-wayland-minecraft/refactor

Conversation

@Scrumplex

@Scrumplex Scrumplex commented May 8, 2024 •
edited
Loading

Copy link
Copy Markdown
Member

Description of changes

Closes #338787

Alternative to #306264

In addition to updating the derivation to 3.4, this combines the two glfw 3.x derivations into one, saving a few lines.

Things done

  • 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/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 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.

@Scrumplex
Scrumplex force-pushed the pkgs/glfw-wayland-minecraft/refactor branch from 4267f99 to db0a288 Compare May 8, 2024 10:43
@ofborg ofborg Bot added 8.has: clean-up This PR removes packages or removes other cruft 8.has: package (new) This PR adds a new package labels May 8, 2024
@ofborg
ofborg Bot requested a review from MarcWeber May 8, 2024 11:09
@ofborg ofborg Bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels May 8, 2024
@getchoo
getchoo self-requested a review May 8, 2024 20:26
getchoo
getchoo reviewed May 12, 2024
View reviewed changes
Comment thread pkgs/games/prismlauncher/wrapper.nix Outdated
@Scrumplex
Scrumplex force-pushed the pkgs/glfw-wayland-minecraft/refactor branch from 67eb179 to 4713297 Compare May 12, 2024 17:23
@Scrumplex
Scrumplex requested a review from getchoo May 13, 2024 16:18
@Scrumplex Scrumplex added the 12.approvals: 1 This PR was reviewed and approved by one person. label May 13, 2024
@wegank wegank removed the 12.approvals: 1 This PR was reviewed and approved by one person. label May 13, 2024
@Scrumplex
Scrumplex force-pushed the pkgs/glfw-wayland-minecraft/refactor branch from 4713297 to 1b1e46c Compare May 26, 2024 14:16
@SuperSandro2000 SuperSandro2000 mentioned this pull request May 28, 2024
Closed
13 tasks
SuperSandro2000
SuperSandro2000 reviewed May 28, 2024
View reviewed changes

@SuperSandro2000 SuperSandro2000 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

glad that we combine those

Comment thread pkgs/top-level/all-packages.nix Outdated
Comment thread pkgs/top-level/all-packages.nix Outdated
Comment thread pkgs/games/prismlauncher/wrapper.nix Outdated
Comment thread pkgs/games/prismlauncher/wrapper.nix Outdated
@Scrumplex
Scrumplex force-pushed the pkgs/glfw-wayland-minecraft/refactor branch from 1b1e46c to fa01652 Compare May 28, 2024 11:04
@SomeoneSerge SomeoneSerge mentioned this pull request May 28, 2024
Closed
oxalica
oxalica suggested changes May 29, 2024
View reviewed changes
Comment thread pkgs/by-name/gl/glfw3/package.nix Outdated
@Scrumplex
Scrumplex force-pushed the pkgs/glfw-wayland-minecraft/refactor branch 3 times, most recently from 397a5c6 to 3c2a133 Compare May 30, 2024 08:40
@Scrumplex
Scrumplex force-pushed the pkgs/glfw-wayland-minecraft/refactor branch from 3c2a133 to a217757 Compare June 6, 2024 10:25
@getchoo

getchoo commented Jun 10, 2024

Copy link
Copy Markdown
Member

Result of nixpkgs-review pr 310073 run on aarch64-linux 1

2 packages built:
  • glfw3-minecraft
  • prismlauncher

@getchoo getchoo added the 12.approvals: 1 This PR was reviewed and approved by one person. label Jun 10, 2024
@wegank wegank added 12.approvals: 2 This PR was reviewed and approved by two persons. and removed 12.approvals: 1 This PR was reviewed and approved by one person. labels Jun 20, 2024
@Scrumplex
Scrumplex force-pushed the pkgs/glfw-wayland-minecraft/refactor branch from a217757 to 60453fb Compare June 30, 2024 18:45
@getchoo getchoo added the 12.approvals: 1 This PR was reviewed and approved by one person. label Jul 3, 2024
@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jul 6, 2024
@Scrumplex
Scrumplex force-pushed the pkgs/glfw-wayland-minecraft/refactor branch from 60453fb to 54f9680 Compare July 21, 2024 08:10
@ofborg ofborg Bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Jul 21, 2024
@ofborg
ofborg Bot requested a review from getchoo July 21, 2024 08:41
@Scrumplex
Scrumplex force-pushed the pkgs/glfw-wayland-minecraft/refactor branch from 54f9680 to bd612d2 Compare August 4, 2024 19:42
@Scrumplex

Scrumplex commented Aug 5, 2024

Copy link
Copy Markdown
Member Author

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

2 packages built:
  • glfw3-minecraft
  • prismlauncher

getchoo
getchoo requested changes Aug 7, 2024
View reviewed changes
Comment thread pkgs/top-level/all-packages.nix Outdated
Comment thread pkgs/top-level/all-packages.nix Outdated
@nixos-discourse

nixos-discourse commented Aug 7, 2024

Copy link
Copy Markdown

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/1890

@Scrumplex
Scrumplex force-pushed the pkgs/glfw-wayland-minecraft/refactor branch from bd612d2 to 053bb0b Compare August 7, 2024 07:16
@ofborg
ofborg Bot requested a review from getchoo August 7, 2024 07:59
@Scrumplex
Scrumplex force-pushed the pkgs/glfw-wayland-minecraft/refactor branch from 053bb0b to 30b7455 Compare August 12, 2024 21:10
@ofborg
ofborg Bot requested a review from getchoo August 12, 2024 22:40
Scrumplex and others added 3 commits September 1, 2024 15:12
@Scrumplex @oxalica
glfw-minecraft: merge glfw-wayland-minecraft into glfw
8dce7da 
The set-cursor patch is taken from:
<Admicos/minecraft-wayland#56>

And other changes including fractional scaling is already upstreamed in
3.4 thus not needed anymore.

Co-authored-by: oxalica <oxalicc@pm.me>
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
@Scrumplex
prismlauncher: deprecate withWaylandGLFW option
2a5017a 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
@Scrumplex
prismlauncher: use top level X11 packages
697d24d 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
@Scrumplex
Scrumplex force-pushed the pkgs/glfw-wayland-minecraft/refactor branch from 30b7455 to 697d24d Compare September 1, 2024 13:13
@Scrumplex Scrumplex mentioned this pull request Sep 1, 2024
Closed
@nixos-discourse

nixos-discourse commented Sep 1, 2024

Copy link
Copy Markdown

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/1936

@Scrumplex Scrumplex added 12.approvals: 2 This PR was reviewed and approved by two persons. and removed 12.approvals: 1 This PR was reviewed and approved by one person. labels Sep 1, 2024
@ofborg
ofborg Bot requested a review from getchoo September 1, 2024 13:58
@getchoo getchoo added 12.approvals: 1 This PR was reviewed and approved by one person. and removed 12.approvals: 2 This PR was reviewed and approved by two persons. labels Sep 2, 2024
jopejoe1
jopejoe1 approved these changes Sep 2, 2024
View reviewed changes

@jopejoe1 jopejoe1 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks!

@jopejoe1
jopejoe1 merged commit 80fa723 into NixOS:master Sep 2, 2024
@Scrumplex
Scrumplex deleted the pkgs/glfw-wayland-minecraft/refactor branch September 29, 2024 09:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 left review comments
@jopejoe1 jopejoe1 jopejoe1 approved these changes
@getchoo getchoo getchoo approved these changes
@MarcWeber MarcWeber Awaiting requested review from MarcWeber
@Minion3665 Minion3665 Awaiting requested review from Minion3665
+2 more reviewers
@oxalica oxalica oxalica requested changes
@pluiedev pluiedev pluiedev approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

8.has: clean-up This PR removes packages or removes other cruft 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Build failure: glfw-wayland-minecraft

8 participants

@Scrumplex @getchoo @nixos-discourse @SuperSandro2000 @oxalica @pluiedev @jopejoe1 @wegank