hyprlandPlugins.hy3: 0.39.1 -> 0.40.0

[andir]

Description of changes

This fixes the compatibility issue with hyprland 0.40 and adds two patches that fixes regressions that were fixed after the latest tag.

Things done

• Built on platform(s)
  • [x ] 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:
  • NixOS test(s) (look inside nixos/tests)
  • and/or package tests
  • or, for functions and "core" functionality, tests in lib/tests or pkgs/test
  • made sure NixOS tests are linked to the relevant packages
• 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.11 Release Notes (or backporting 23.11 and 24.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.

[Mange]

Since #314522 this fails to compile because the latter patch uses files that were removed in the downgrade.

Should we downgrade this package too, perhaps?

---

[EDIT:]

Error log

@nix { "action": "setPhase", "phase": "unpackPhase" }
Running phase: unpackPhase
unpacking source archive /nix/store/rrg9vcwxzncwjbv17ky56p32gijz41ab-source
source root is source
@nix { "action": "setPhase", "phase": "patchPhase" }
Running phase: patchPhase
applying patch /nix/store/bx4jc9002cl5j08mh5ggl3dqp6vr4fzb-33c8d761ff1c1d2264f7549a7bcfc010929d153c.patch
patching file src/Hy3Layout.cpp
patching file src/dispatchers.cpp
applying patch /nix/store/ig0sy24f5vc78vmvcz4irqq2518h34al-400930e0391a0e13ebbc6a3b9fe162e00aaad89a.patch
patching file flake.lock
patching file flake.nix
patching file src/Hy3Layout.cpp
patching file src/dispatchers.cpp
@nix { "action": "setPhase", "phase": "updateAutotoolsGnuConfigScriptsPhase" }
Running phase: updateAutotoolsGnuConfigScriptsPhase
@nix { "action": "setPhase", "phase": "configurePhase" }
Running phase: configurePhase
fixing cmake files...
cmake flags: -DCMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY=OFF -DCMAKE_FIND_USE_PACKAGE_REGISTRY=OFF -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF -DCMAKE_INSTALL_LOCALEDIR=/nix/store/fwcrwvg1rm8xjcq5i3zgmx055psy3xcc-hy3-0.40.0/share/locale -DCMAKE_INSTALL_LIBEXECDIR=/nix/store/fwcrwvg1rm8xjcq5i3zgmx055psy3xcc-hy3-0.40.0/libexec -DCMAKE_INSTALL_LIBDIR=/nix/store/fwcrwvg1rm8xjcq5i3zgmx055psy3xcc-hy3-0.40.0/lib -DCMAKE_INSTALL_DOCDIR=/nix/store/fwcrwvg1rm8xjcq5i3zgmx055psy3xcc-hy3-0.40.0/share/doc/Hy3 -DCMAKE_INSTALL_INFODIR=/nix/store/fwcrwvg1rm8xjcq5i3zgmx055psy3xcc-hy3-0.40.0/share/info -DCMAKE_INSTALL_MANDIR=/nix/store/fwcrwvg1rm8xjcq5i3zgmx055psy3xcc-hy3-0.40.0/share/man -DCMAKE_INSTALL_OLDINCLUDEDIR=/nix/store/fwcrwvg1rm8xjcq5i3zgmx055psy3xcc-hy3-0.40.0/include -DCMAKE_INSTALL_INCLUDEDIR=/nix/store/fwcrwvg1rm8xjcq5i3zgmx055psy3xcc-hy3-0.40.0/include -DCMAKE_INSTALL_SBINDIR=/nix/store/fwcrwvg1rm8xjcq5i3zgmx055psy3xcc-hy3-0.40.0/sbin -DCMAKE_INSTALL_BINDIR=/nix/store/fwcrwvg1rm8xjcq5i3zgmx055psy3xcc-hy3-0.40.0/bin -DCMAKE_INSTALL_NAME_DIR=/nix/store/fwcrwvg1rm8xjcq5i3zgmx055psy3xcc-hy3-0.40.0/lib -DCMAKE_POLICY_DEFAULT_CMP0025=NEW -DCMAKE_OSX_SYSROOT= -DCMAKE_FIND_FRAMEWORK=LAST -DCMAKE_STRIP=/nix/store/9bv7dcvmfcjnmg5mnqwqlq2wxfn8d7yi-gcc-wrapper-13.2.0/bin/strip -DCMAKE_RANLIB=/nix/store/9bv7dcvmfcjnmg5mnqwqlq2wxfn8d7yi-gcc-wrapper-13.2.0/bin/ranlib -DCMAKE_AR=/nix/store/9bv7dcvmfcjnmg5mnqwqlq2wxfn8d7yi-gcc-wrapper-13.2.0/bin/ar -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_INSTALL_PREFIX=/nix/store/fwcrwvg1rm8xjcq5i3zgmx055psy3xcc-hy3-0.40.0  
-- The C compiler identification is GNU 13.2.0
-- The CXX compiler identification is GNU 13.2.0
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Check for working C compiler: /nix/store/9bv7dcvmfcjnmg5mnqwqlq2wxfn8d7yi-gcc-wrapper-13.2.0/bin/gcc - skipped
-- Detecting C compile features
-- Detecting C compile features - done
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
-- Check for working CXX compiler: /nix/store/9bv7dcvmfcjnmg5mnqwqlq2wxfn8d7yi-gcc-wrapper-13.2.0/bin/g++ - skipped
-- Detecting CXX compile features
-- Detecting CXX compile features - done
-- Found PkgConfig: /nix/store/zdvrzlvzbn9ymb0z8na50w995j8np16z-pkg-config-wrapper-0.29.2/bin/pkg-config (found version "0.29.2")
-- Checking for modules 'hyprland;pixman-1;libdrm;pango;pangocairo'
--   Found hyprland, version 0.40.0
--   Found pixman-1, version 0.43.4
--   Found libdrm, version 2.4.120
--   Found pango, version 1.52.2
--   Found pangocairo, version 1.52.2
Package libpcre2-8 was not found in the pkg-config search path.
Perhaps you should add the directory containing `libpcre2-8.pc'
to the PKG_CONFIG_PATH environment variable
Package 'libpcre2-8', required by 'glib-2.0', not found
Package libpcre2-8 was not found in the pkg-config search path.
Perhaps you should add the directory containing `libpcre2-8.pc'
to the PKG_CONFIG_PATH environment variable
Package 'libpcre2-8', required by 'glib-2.0', not found
Package libpcre2-8 was not found in the pkg-config search path.
Perhaps you should add the directory containing `libpcre2-8.pc'
to the PKG_CONFIG_PATH environment variable
Package 'libpcre2-8', required by 'glib-2.0', not found
Package libpcre2-8 was not found in the pkg-config search path.
Perhaps you should add the directory containing `libpcre2-8.pc'
to the PKG_CONFIG_PATH environment variable
Package 'libpcre2-8', required by 'glib-2.0', not found
-- Configuring done (0.9s)
-- Generating done (0.0s)
�[33mCMake Warning:
  Manually-specified variables were not used by the project:

    BUILD_TESTING
    CMAKE_EXPORT_NO_PACKAGE_REGISTRY
    CMAKE_INSTALL_BINDIR
    CMAKE_INSTALL_DOCDIR
    CMAKE_INSTALL_INCLUDEDIR
    CMAKE_INSTALL_INFODIR
    CMAKE_INSTALL_LIBEXECDIR
    CMAKE_INSTALL_LOCALEDIR
    CMAKE_INSTALL_MANDIR
    CMAKE_INSTALL_OLDINCLUDEDIR
    CMAKE_INSTALL_SBINDIR
    CMAKE_POLICY_DEFAULT_CMP0025

�[0m
-- Build files have been written to: /build/source/build
cmake: enabled parallel building
cmake: enabled parallel installing
@nix { "action": "setPhase", "phase": "buildPhase" }
Running phase: buildPhase
build flags: -j32 SHELL=/nix/store/306znyj77fv49kwnkpxmb0j2znqpa8bj-bash-5.2p26/bin/bash
[ 28%] �[32mBuilding CXX object CMakeFiles/hy3.dir/src/main.cpp.o�[0m
[ 28%] �[32mBuilding CXX object CMakeFiles/hy3.dir/src/dispatchers.cpp.o�[0m
[ 42%] �[32mBuilding CXX object CMakeFiles/hy3.dir/src/TabGroup.cpp.o�[0m
[ 57%] �[32mBuilding CXX object CMakeFiles/hy3.dir/src/SelectionHook.cpp.o�[0m
[ 71%] �[32mBuilding CXX object CMakeFiles/hy3.dir/src/Hy3Layout.cpp.o�[0m
[ 85%] �[32mBuilding CXX object CMakeFiles/hy3.dir/src/Hy3Node.cpp.o�[0m
�[01m�[K/build/source/src/Hy3Layout.cpp:8:10:�[m�[K �[01;31m�[Kfatal error: �[m�[Khyprland/src/managers/PointerManager.hpp: No such file or directory
    8 | #include �[01;31m�[K<hyprland/src/managers/PointerManager.hpp>�[m�[K
      |          �[01;31m�[K^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~�[m�[K
compilation terminated.
make[2]: *** [CMakeFiles/hy3.dir/build.make:104: CMakeFiles/hy3.dir/src/Hy3Layout.cpp.o] Error 1
make[2]: *** Waiting for unfinished jobs....
�[01m�[K/build/source/src/Hy3Node.cpp:�[m�[K In member function '�[01m�[KPHLWINDOW Hy3Node::�[01;32m�[KbringToTop�[m�[K()�[m�[K':
�[01m�[K/build/source/src/Hy3Node.cpp:212:1:�[m�[K �[01;35m�[Kwarning: �[m�[Kcontrol reaches end of non-void function [�[01;35m�[K�]8;;https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wreturn-type�-Wreturn-type�]8;;��[m�[K]
  212 | �[01;35m�[K}�[m�[K
      | �[01;35m�[K^�[m�[K
�[01m�[K/build/source/src/Hy3Node.cpp:�[m�[K In member function '�[01m�[KHy3Node* Hy3Node::�[01;32m�[KgetFocusedNode�[m�[K(bool, bool)�[m�[K':
�[01m�[K/build/source/src/Hy3Node.cpp:275:1:�[m�[K �[01;35m�[Kwarning: �[m�[Kcontrol reaches end of non-void function [�[01;35m�[K�]8;;https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wreturn-type�-Wreturn-type�]8;;��[m�[K]
  275 | �[01;35m�[K}�[m�[K
      | �[01;35m�[K^�[m�[K
�[01m�[K/build/source/src/Hy3Node.cpp:�[m�[K In member function '�[01m�[Kbool Hy3Node::�[01;32m�[KisUrgent�[m�[K()�[m�[K':
�[01m�[K/build/source/src/Hy3Node.cpp:620:1:�[m�[K �[01;35m�[Kwarning: �[m�[Kcontrol reaches end of non-void function [�[01;35m�[K�]8;;https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wreturn-type�-Wreturn-type�]8;;��[m�[K]
  620 | �[01;35m�[K}�[m�[K
      | �[01;35m�[K^�[m�[K
�[01m�[K/build/source/src/Hy3Node.cpp:�[m�[K In member function '�[01m�[Kvoid Hy3Node::�[01;32m�[KrecalcSizePosRecursive�[m�[K(bool)�[m�[K':
�[01m�[K/build/source/src/Hy3Node.cpp:381:71:�[m�[K �[01;35m�[Kwarning: �[m�[K'�[01m�[Kconstraint�[m�[K' may be used uninitialized [�[01;35m�[K�]8;;https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wmaybe-uninitialized�-Wmaybe-uninitialized�]8;;��[m�[K]
  381 |             group.layout != Hy3GroupLayout::Tabbed ? �[01;35m�[Kchild_count <= 0 ? 0 : constraint / child_count�[m�[K : 0;
      |                                                      �[01;35m�[K~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~�[m�[K
�[01m�[K/build/source/src/Hy3Node.cpp:362:16:�[m�[K �[01;36m�[Knote: �[m�[K'�[01m�[Kconstraint�[m�[K' was declared here
  362 |         double �[01;36m�[Kconstraint�[m�[K;
      |                �[01;36m�[K^~~~~~~~~~�[m�[K
make[1]: *** [CMakeFiles/Makefile2:83: CMakeFiles/hy3.dir/all] Error 2
make: *** [Makefile:136: all] Error 2

[EDIT2]: If any other Nix n00b (like me) want to know how I worked around it for now:

{ pkgs, ... }: let
  fixedHy3 = pkgs.hyprlandPlugins.hy3.overrideDerivation (oldAttrs: {
    # Remove patches that break hy3 on hyprland 0.40.0-unstable-2024-05-05
    patches = [];
  });
in
{
  # ...
  wayland.windowManager.hyprland = {
    enable = true;
    plugins = [fixedHy3];
    # ...
  };
  # ...
}