Merge pull request #319131 from JohnRTitor/hyprland

hyprland: 0.40.0-unstable-2024-05-05 -> 0.41.1; hyprwayland-scanner: 0.3.4 -> 0.3.10; hyprlandPlugins.hy3: 0.40.0 -> 0.41.0; hyprutils: init at 0.1.2 

2 files changed, 8 insertions, 171 deletions

diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix
index 413de25764114..859ddf6dcecc0 100644
--- a/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix
@@ -22,27 +22,27 @@ let
 
   plugins = {
     hy3 = { fetchFromGitHub, cmake, hyprland }:
-      mkHyprlandPlugin hyprland {
+      mkHyprlandPlugin hyprland rec {
         pluginName = "hy3";
-        version = "0.40.0";
+        version = "0.41.0";
 
         src = fetchFromGitHub {
           owner = "outfoxxed";
           repo = "hy3";
-          rev = "hl0.40.0";
-          hash = "sha256-Y9bIML3C5xyKKv+Yel4LUfSkScwGunOVZkg+Z1dPwHI=";
+          rev = "hl${version}";
+          hash = "sha256-gEEWWlQRvejSR2RRg78Lubz6siIgknqj6CslveyyIP4=";
         };
 
         nativeBuildInputs = [ cmake ];
 
         dontStrip = true;
 
-        meta = with lib; {
+        meta = {
           homepage = "https://github.com/outfoxxed/hy3";
           description = "Hyprland plugin for an i3 / sway like manual tiling layout";
-          license = licenses.gpl3;
-          platforms = platforms.linux;
-          maintainers = [ maintainers.aacebedo ];
+          license = lib.licenses.gpl3;
+          platforms = lib.platforms.linux;
+          maintainers = with lib.maintainers; [ aacebedo ];
         };
       };
   };
diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/hyprland/default.nix
deleted file mode 100644
index 958e84ac78f0e..0000000000000
--- a/pkgs/applications/window-managers/hyprwm/hyprland/default.nix
+++ /dev/null
@@ -1,163 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, pkg-config
-, makeWrapper
-, meson
-, cmake
-, ninja
-, binutils
-, cairo
-, epoll-shim
-, git
-, hyprcursor
-, hyprland-protocols
-, hyprlang
-, hyprwayland-scanner
-, jq
-, libGL
-, libdrm
-, libexecinfo
-, libinput
-, libuuid
-, libxkbcommon
-, mesa
-, pango
-, pciutils
-, pkgconf
-, python3
-, systemd
-, tomlplusplus
-, wayland
-, wayland-protocols
-, wayland-scanner
-, xwayland
-, hwdata
-, seatd
-, libdisplay-info
-, libliftoff
-, xorg
-, debug ? false
-, enableXWayland ? true
-, legacyRenderer ? false
-, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd
-, wrapRuntimeDeps ? true
-  # deprecated flags
-, nvidiaPatches ? false
-, hidpiXWayland ? false
-, enableNvidiaPatches ? false
-}:
-assert lib.assertMsg (!nvidiaPatches) "The option `nvidiaPatches` has been removed.";
-assert lib.assertMsg (!enableNvidiaPatches) "The option `enableNvidiaPatches` has been removed.";
-assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been removed. Please refer https://wiki.hyprland.org/Configuring/XWayland";
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "hyprland" + lib.optionalString debug "-debug";
-  version = "0.40.0-unstable-2024-05-05";
-
-  src = fetchFromGitHub {
-    owner = "hyprwm";
-    repo = finalAttrs.pname;
-    fetchSubmodules = true;
-    rev = "f15513309b24790099d42974274eb23f66f7c985";
-    hash = "sha256-zKOfgXPTlRqCR+EME4qjN9rgAnC3viI5KWx10dhKszw=";
-  };
-
-  postPatch = ''
-    # Fix hardcoded paths to /usr installation
-    sed -i "s#/usr#$out#" src/render/OpenGL.cpp
-  '';
-
-  # used by version.sh
-  DATE = "2024-05-05";
-  HASH = finalAttrs.src.rev;
-
-  depsBuildBuild = [
-    # to find wayland-scanner when cross-compiling
-    pkg-config
-  ];
-
-  nativeBuildInputs = [
-    hwdata
-    hyprwayland-scanner
-    jq
-    makeWrapper
-    cmake
-    meson # for wlroots
-    ninja
-    pkg-config
-    wayland-scanner
-    python3 # for udis86
-  ];
-
-  outputs = [
-    "out"
-    "man"
-    "dev"
-  ];
-
-  buildInputs = [
-    cairo
-    git
-    hyprcursor
-    hyprland-protocols
-    hyprlang
-    libGL
-    libdrm
-    libinput
-    libuuid
-    libxkbcommon
-    mesa
-    wayland
-    wayland-protocols
-    pango
-    pciutils
-    tomlplusplus
-    # for subproject wlroots-hyprland
-    seatd
-    libliftoff
-    libdisplay-info
-    xorg.xcbutilerrors
-    xorg.xcbutilrenderutil
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isBSD [ epoll-shim ]
-  ++ lib.optionals stdenv.hostPlatform.isMusl [ libexecinfo ]
-  ++ lib.optionals enableXWayland [
-    xorg.libxcb
-    xorg.libXdmcp
-    xorg.xcbutil
-    xorg.xcbutilwm
-    xwayland
-  ]
-  ++ lib.optionals withSystemd [ systemd ];
-
-  cmakeBuildType =
-    if debug
-    then "Debug"
-    else "RelWithDebInfo";
-
-
-  cmakeFlags = [
-    (lib.cmakeBool "NO_XWAYLAND" (!enableXWayland))
-    (lib.cmakeBool "LEGACY_RENDERER" legacyRenderer)
-    (lib.cmakeBool "NO_SYSTEMD" (!withSystemd))
-  ];
-
-  postInstall = ''
-    ${lib.optionalString wrapRuntimeDeps ''
-      wrapProgram $out/bin/Hyprland \
-        --suffix PATH : ${lib.makeBinPath [binutils pciutils pkgconf]}
-    ''}
-  '';
-
-  passthru.providedSessions = [ "hyprland" ];
-
-  meta = with lib; {
-    homepage = "https://github.com/hyprwm/Hyprland";
-    description = "Dynamic tiling Wayland compositor that doesn't sacrifice on its looks";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ wozeparrot fufexan ];
-    mainProgram = "Hyprland";
-    platforms = lib.platforms.linux;
-  };
-})