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

glfw: support wayland #129367

Merged
merged 1 commit into from
Jul 14, 2021
Merged

glfw: support wayland #129367

merged 1 commit into from
Jul 14, 2021

Conversation

luc65r
Copy link
Contributor

@luc65r luc65r commented Jul 5, 2021

Motivation for this change
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
  • 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/)
  • 21.11 Release Notes (or backporting 21.05 Relase 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.

@luc65r luc65r requested a review from Luflosi July 5, 2021 20:43
@luc65r
Copy link
Contributor Author

luc65r commented Jul 5, 2021

waylandSupport isn't true by default, because it disables xorg support

Copy link
Contributor

@Luflosi Luflosi left a comment

Choose a reason for hiding this comment

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

LGTM

@r-rmcgibbo
Copy link

r-rmcgibbo commented Jul 5, 2021

Result of nixpkgs-review pr 129367 at c3b51a96 run on aarch64-linux 1

4 packages marked as broken and skipped:
  • embree
  • embree2
  • forge
  • luxcorerender
2 packages failed to build:
3 packages skipped due to time constraints:
  • idrisPackages.glfw
  • tev
  • tracy
16 packages built successfully:
  • MIDIVisualizer
  • glfw (glfw3)
  • glfw-wayland
  • glslviewer
  • goxel
  • libsForQt5.mapbox-gl-native (libsForQt515.mapbox-gl-native ,plasma5Packages.mapbox-gl-native)
  • libsForQt5.mapbox-gl-qml (libsForQt515.mapbox-gl-qml ,plasma5Packages.mapbox-gl-qml)
  • libsForQt512.mapbox-gl-native
  • libsForQt512.mapbox-gl-qml
  • libsForQt514.mapbox-gl-native
  • libsForQt514.mapbox-gl-qml
  • pixelnuke
  • pure-maps
  • raylib
  • taisei
  • vlang

Note that build failures may predate this PR, and could be nondeterministic or hardware dependent.
Please exercise your independent judgement. Does something look off? Please file an issue or reach out on IRC.


Result of nixpkgs-review pr 129367 at e2d2834b run on x86_64-linux 1

9 packages skipped due to time constraints:
  • blender
  • embree2
  • forge
  • glslviewer
  • idrisPackages.glfw
  • libsForQt514.mapbox-gl-native
  • libsForQt514.mapbox-gl-qml
  • luxcorerender
  • tev
18 packages built successfully:
  • MIDIVisualizer
  • ccextractor
  • embree
  • glfw (glfw3)
  • glfw-wayland
  • goxel
  • io
  • libsForQt5.mapbox-gl-native (libsForQt515.mapbox-gl-native ,plasma5Packages.mapbox-gl-native)
  • libsForQt5.mapbox-gl-qml (libsForQt515.mapbox-gl-qml ,plasma5Packages.mapbox-gl-qml)
  • libsForQt512.mapbox-gl-native
  • libsForQt512.mapbox-gl-qml
  • pixelnuke
  • pure-maps
  • raylib
  • taisei
  • tracy
  • vcv-rack
  • vlang
1 suggestion:
  • error: no-flags-spaces

    cmakeFlags cannot contain spaces, please use cmakeFlagsArray in Bash.

    Near pkgs/development/libraries/glfw/3.x.nix:31:3:

       |
    31 |   cmakeFlags = [
       |   ^
    

@luc65r
Copy link
Contributor Author

luc65r commented Jul 6, 2021

The changes should not impact glfw or the packages that depend on it.
The hash changed because:

- /nix/store/imznpbb9xpqix45j2fp31z0pfbax3xzk-glfw-3.3.4.drv:{out}
+ /nix/store/988k6apczisb5yrs1kir616g70ynnkb7-glfw-3.3.4.drv:{out}
• The environments do not match:
    + postPatch=

@luc65r
Copy link
Contributor Author

luc65r commented Jul 11, 2021

glfw/glfw#1711 This pr fixes freezes and makes glfw usable on wayland, but it has been a year and it's still not merged.
Should I apply the patch here?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants