hyprland: 0.39.1 -> 0.40.0; hyprwayland-scanner: init at 0.3.4#309075
hyprland: 0.39.1 -> 0.40.0; hyprwayland-scanner: init at 0.3.4#309075Aleksanaa merged 2 commits intoNixOS:masterfrom
Conversation
ofborg
bot
added
11.by: package-maintainer
|
This will break other programs that listen to sockets, most notably, Waybar. I'd have to backport the patches if needed. Unless there is a new release of Waybar before this PR is merged Alexays/Waybar#3212 |
|
Looks like swaylock and hyprlock are broken on 0.40.0, so probably makes sense to include the fix: hyprwm/Hyprland#5913 |
|
@fufexan It landed. |
|
Everything's almost working. There's one last thing left to solve. When building, CMake complains about missing XWayland include paths: hyprland> CMake Error in CMakeLists.txt:
hyprland> Imported target "PkgConfig::xdeps" includes non-existent path
hyprland> "/nix/store/7q83znq247cfc65h3zzq6l82z8dr9d56-xwayland-23.2.6/include"
hyprland> in its INTERFACE_INCLUDE_DIRECTORIES. Possible reasons include:
hyprland> * The path was deleted, renamed, or moved to another location.
hyprland> * An install or uninstall procedure did not complete successfully.
hyprland> * The installation package was faulty and references files it does not
hyprland> provide.Checking the out dir of Ideally, this should be fixed in xwayland upstream. I've tested the latest tag, Alternatively, we could solve the problem if we could remove the path from |
|
I have a fix for the upstream xwayland meson pkgconfig generation, will pull this in once its merged. Edit: upstream MR: https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1543 |
|
So we currently need to wait for this PR to be merged upstream, a new version is released upstream, and nixpkgs updates xwayland before we can continue this PR? |
My plan is to get this merged and than fetchpatch it into nixpkgs. If I read Olivier correctly we can than remove the patch with the 24.x release. |
|
Merging should not be needed, just use |
The first commit is enough for the backport. My assumption was that this PR is still "Draft" and there is no need to fix this right now, but it appears that this is still a draft PR since Xwayland needs fixing first. #311886 |
|
#311966 which includes the 24.1.0 bump has been merged. |
|
Please be quick. The current input focus issue almost caused me to send my login password to the NixOS group today 🫠 |
Aleksanaa
left a comment
Aleksanaa
left a comment
There was a problem hiding this comment.
Okay so I've tested in a quick way:
nix build github:fufexan/nixpkgs/hyprland#hyprland
ln -s $(realpath ./result) /tmp/hyprland-tmp-1
And then logout and change login command in greetd into /tmp/hyprland-tmp-1/bin/hyprland, and yeah it works (However, I observed that the output settings of kanshi and hyprland seemed to have a race, but the race with swww is solved, and input issue is gone too)
wegank
added
the
12.approvals: 1
|
lets gooo |
|
This crashes my hyprland when using it with nouveau and moving my cursor to the top of the screen. here the logs from one of the crashes: |
|
I can update hyprland again when there's a fix. Until then, either use an older nixpkgs, or use the flake package. |
|
Not an ideal situation just a few days before the branch off. |
|
@wuyoli I've downgraded hyprland by a few commits, can you test whether it's all working? |
Can anyone shed some light on what this is about? 😄 Also, since I'm here, I just want to thank everyone involved in this! 🙏🏽 I haven't experienced any issues so far with Hyprlock, Hypridle and Pyprland scratchpads 👍🏽 |
NixOS 24.05 will be released soon. See more about the process here. |
|
@fufexan I cherry-picked your commit fufexan@7c60f01 . this didn't work, but with 7185b47 everything worked again. |
|
Great, I'll make a quick PR then. |
|
Also, @wuyoli do screen lockers work fine? I just remembered about Flakebi's comment. |
|
Sorry, it just crashed again, this time it wasn't obviously in connection to some action i did. The issue with the cursor hotspot is fixed though. |
no very much not. hyprland crashes instantly (I'm using swaylock) |
That's at least something. The crash could also be related to some kernel, nouveau, some driver or maybe also xwayland but that the cursor is so much off for high DPI is good to be fixed for 24.05. |
Before this change, the xwayland pkgconfig file will always contain an
includedir directive, even though xwayland is not a linkable shared
library:
prefix=/nix/store/3spcjqp5zcyg8arz6dnsj59fal5yk3jy-xwayland-23.2.6
includedir=${prefix}/include
exec_prefix=${prefix}
xwayland=/nix/store/3spcjqp5zcyg8arz6dnsj59fal5yk3jy-xwayland-23.2.6/bin/Xwayland
[…]
Cflags: -I${includedir}
According to a bug reporter this trips up cmake [1], which expects that
the include directory exists, which it does not since xwayland does not
install any header files.
Add the dataonly directive to pkgsconfig.generate() which will remove
the default "." subdir and ensures that includedir is not set inside the
pkgconfig file. Additionally enforce the install directory to
$libdir/pkgconfig, since it otherwise will be installed to
$datadir/pkgconfig, which precludes programs from finding the pkgconfig
because share/pkgconfig is usually not included in the search path.
The resulting pkgconfig does not contain an includedir:
prefix=/nix/store/p7xhdzl65hfhzf36vxykzp2i9cyy7y6c-xwayland-23.2.6
exec_prefix=${prefix}
xwayland=/nix/store/p7xhdzl65hfhzf36vxykzp2i9cyy7y6c-xwayland-23.2.6/bin/Xwayland
have_glamor=true
have_eglstream=true
have_initfd=true
have_listenfd=true
have_verbose=true
have_terminate_delay=true
have_no_touch_pointer_emulation=true
have_force_xrandr_emulation=true
have_geometry=true
have_fullscreen=true
have_host_grab=true
have_decorate=false
have_enable_ei_portal=true
have_byteswappedclients=true
Name: Xwayland
Description: X Server for Wayland
Version: 23.2.6
[1]: NixOS/nixpkgs#309075 (comment)
Signed-off-by: Rouven Czerwinski <rouven@czerwinskis.de>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
(cherry picked from commit 9df084c)
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1569>
Before this change, the xwayland pkgconfig file will always contain an
includedir directive, even though xwayland is not a linkable shared
library:
prefix=/nix/store/3spcjqp5zcyg8arz6dnsj59fal5yk3jy-xwayland-23.2.6
includedir=${prefix}/include
exec_prefix=${prefix}
xwayland=/nix/store/3spcjqp5zcyg8arz6dnsj59fal5yk3jy-xwayland-23.2.6/bin/Xwayland
[…]
Cflags: -I${includedir}
According to a bug reporter this trips up cmake [1], which expects that
the include directory exists, which it does not since xwayland does not
install any header files.
Add the dataonly directive to pkgsconfig.generate() which will remove
the default "." subdir and ensures that includedir is not set inside the
pkgconfig file. Additionally enforce the install directory to
$libdir/pkgconfig, since it otherwise will be installed to
$datadir/pkgconfig, which precludes programs from finding the pkgconfig
because share/pkgconfig is usually not included in the search path.
The resulting pkgconfig does not contain an includedir:
prefix=/nix/store/p7xhdzl65hfhzf36vxykzp2i9cyy7y6c-xwayland-23.2.6
exec_prefix=${prefix}
xwayland=/nix/store/p7xhdzl65hfhzf36vxykzp2i9cyy7y6c-xwayland-23.2.6/bin/Xwayland
have_glamor=true
have_eglstream=true
have_initfd=true
have_listenfd=true
have_verbose=true
have_terminate_delay=true
have_no_touch_pointer_emulation=true
have_force_xrandr_emulation=true
have_geometry=true
have_fullscreen=true
have_host_grab=true
have_decorate=false
have_enable_ei_portal=true
have_byteswappedclients=true
Name: Xwayland
Description: X Server for Wayland
Version: 23.2.6
[1]: NixOS/nixpkgs#309075 (comment)
Signed-off-by: Rouven Czerwinski <rouven@czerwinskis.de>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1543>
Before this change, the xwayland pkgconfig file will always contain an
includedir directive, even though xwayland is not a linkable shared
library:
prefix=/nix/store/3spcjqp5zcyg8arz6dnsj59fal5yk3jy-xwayland-23.2.6
includedir=${prefix}/include
exec_prefix=${prefix}
xwayland=/nix/store/3spcjqp5zcyg8arz6dnsj59fal5yk3jy-xwayland-23.2.6/bin/Xwayland
[…]
Cflags: -I${includedir}
According to a bug reporter this trips up cmake [1], which expects that
the include directory exists, which it does not since xwayland does not
install any header files.
Add the dataonly directive to pkgsconfig.generate() which will remove
the default "." subdir and ensures that includedir is not set inside the
pkgconfig file. Additionally enforce the install directory to
$libdir/pkgconfig, since it otherwise will be installed to
$datadir/pkgconfig, which precludes programs from finding the pkgconfig
because share/pkgconfig is usually not included in the search path.
The resulting pkgconfig does not contain an includedir:
prefix=/nix/store/p7xhdzl65hfhzf36vxykzp2i9cyy7y6c-xwayland-23.2.6
exec_prefix=${prefix}
xwayland=/nix/store/p7xhdzl65hfhzf36vxykzp2i9cyy7y6c-xwayland-23.2.6/bin/Xwayland
have_glamor=true
have_eglstream=true
have_initfd=true
have_listenfd=true
have_verbose=true
have_terminate_delay=true
have_no_touch_pointer_emulation=true
have_force_xrandr_emulation=true
have_geometry=true
have_fullscreen=true
have_host_grab=true
have_decorate=false
have_enable_ei_portal=true
have_byteswappedclients=true
Name: Xwayland
Description: X Server for Wayland
Version: 23.2.6
[1]: NixOS/nixpkgs#309075 (comment)
Signed-off-by: Rouven Czerwinski <rouven@czerwinskis.de>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1543>
(cherry picked from commit 9df084c)
12 participants
Description of changes
Blocked until #306557 lands in master. Tracking https://nixpk.gs/pr-tracker.html?pr=306557.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.