diff --git a/pkgs/by-name/hy/hyprland/info.json b/pkgs/by-name/hy/hyprland/info.json index 1b81e8684842..850a0cb050db 100644 --- a/pkgs/by-name/hy/hyprland/info.json +++ b/pkgs/by-name/hy/hyprland/info.json @@ -1,7 +1,7 @@ { "branch": "main", - "commit_hash": "9a09eac79b85c846e3a865a9078a3f8ff65a9259", - "commit_message": "props: bump version to 0.42.0", - "date": "2024-08-07", - "tag": "v0.42.0" + "commit_hash": "0f594732b063a90d44df8c5d402d658f27471dfe", + "commit_message": "props: bump version to 0.43.0", + "date": "2024-09-08", + "tag": "v0.43.0" } diff --git a/pkgs/by-name/hy/hyprland/package.nix b/pkgs/by-name/hy/hyprland/package.nix index 9d3fbdd0889d..99a80aa30187 100644 --- a/pkgs/by-name/hy/hyprland/package.nix +++ b/pkgs/by-name/hy/hyprland/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, pkg-config, makeWrapper, cmake, @@ -11,34 +10,23 @@ binutils, cairo, epoll-shim, - expat, - fribidi, git, - hwdata, hyprcursor, hyprlang, hyprutils, hyprwayland-scanner, jq, libGL, - libdatrie, - libdisplay-info, libdrm, libexecinfo, libinput, - libliftoff, - libselinux, - libsepol, - libthai, libuuid, libxkbcommon, mesa, pango, pciutils, - pcre2, pkgconf, python3, - seatd, systemd, tomlplusplus, wayland, @@ -66,26 +54,19 @@ assert lib.assertMsg (!hidpiXWayland) stdenv.mkDerivation (finalAttrs: { pname = "hyprland" + lib.optionalString debug "-debug"; - version = "0.42.0"; + version = "0.43.0"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprland"; fetchSubmodules = true; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-deu8zvgseDg2gQEnZiCda4TrbA6pleE9iItoZlsoMtE="; + hash = "sha256-+wE97utoDfhQP6AMdZHUmBeL8grbce/Jv2i5M+6AbaE="; }; patches = [ - # Fixes broken OpenGL applications on Apple silicon (Asahi Linux) - # Based on commit https://github.com/hyprwm/Hyprland/commit/279ec1c291021479b050c83a0435ac7076c1aee0 - ./asahi-fix.patch - - # https://github.com/hyprwm/Hyprland/pull/7467 - (fetchpatch { - url = "https://github.com/hyprwm/Hyprland/commit/a437e44a6af8e8f42966ffe3a26c1d562fce6b33.diff"; - hash = "sha256-Y0P4rY6HyPN8Y5Kowlgyj0PiAHh6nqPRAQ4iFT0l4E8="; - }) + # forces GCC to use -std=c++26 on CMake < 3.30 + "${finalAttrs.src}/nix/stdcxx.patch" ]; postPatch = '' @@ -131,29 +112,18 @@ stdenv.mkDerivation (finalAttrs: { [ aquamarine cairo - expat - fribidi git - hwdata hyprcursor.dev hyprlang hyprutils libGL - libdatrie - libdisplay-info libdrm libinput - libliftoff - libselinux - libsepol - libthai libuuid libxkbcommon mesa pango pciutils - pcre2 - seatd tomlplusplus wayland wayland-protocols @@ -164,9 +134,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals enableXWayland [ xorg.libxcb xorg.libXdmcp - xorg.xcbutil xorg.xcbutilerrors - xorg.xcbutilrenderutil xorg.xcbutilwm xwayland ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 57e5ee790858..637c146dbdaa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5341,7 +5341,7 @@ with pkgs; cairo = cairo.override { xcbSupport = true; }; }; hyprland = callPackage ../by-name/hy/hyprland/package.nix { - libliftoff = libliftoff_0_4; + stdenv = gcc14Stdenv; }; hyprland-autoname-workspaces = callPackage ../applications/misc/hyprland-autoname-workspaces { };