pyrox.dev / nixpkgs
lol
fork atom

hyprland: 0.32.3 -> 0.33.1

authored by Mihai Fufezan and committed by Jörg Thalheim 18ee0842 5027eafc

+11 -54
unified split
+6 -5
pkgs/applications/window-managers/hyprwm/hyprland/default.nix
··· 28 28 , xcbutilwm 29 29 , xwayland 30 30 , debug ? false 31 - , enableNvidiaPatches ? false 32 31 , enableXWayland ? true 33 32 , legacyRenderer ? false 34 33 , withSystemd ? true ··· 36 35 # deprecated flags 37 36 , nvidiaPatches ? false 38 37 , hidpiXWayland ? false 38 + , enableNvidiaPatches ? false 39 39 }: 40 - assert lib.assertMsg (!nvidiaPatches) "The option `nvidiaPatches` has been renamed `enableNvidiaPatches`"; 40 + assert lib.assertMsg (!nvidiaPatches) "The option `nvidiaPatches` has been removed."; 41 + assert lib.assertMsg (!enableNvidiaPatches) "The option `enableNvidiaPatches` has been removed."; 41 42 assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been removed. Please refer https://wiki.hyprland.org/Configuring/XWayland"; 42 43 stdenv.mkDerivation (finalAttrs: { 43 44 pname = "hyprland" + lib.optionalString debug "-debug"; 44 - version = "0.32.3"; 45 + version = "0.33.1"; 45 46 46 47 src = fetchFromGitHub { 47 48 owner = "hyprwm"; 48 49 repo = finalAttrs.pname; 49 50 rev = "v${finalAttrs.version}"; 50 - hash = "sha256-8PP26+ybmScq5WpFd2JPqUDzG2VggYOvD6/rzY9/CJ4="; 51 + hash = "sha256-p7el5oQZPy9l1zyIrlHu6nA4BAu59eLoSqBjhkw2jaw="; 51 52 }; 52 53 53 54 patches = [ ··· 99 100 wayland-protocols 100 101 pango 101 102 pciutils 102 - (wlroots.override { inherit enableNvidiaPatches; }) 103 + wlroots 103 104 ] 104 105 ++ lib.optionals stdenv.hostPlatform.isMusl [ libexecinfo ] 105 106 ++ lib.optionals enableXWayland [ libxcb xcbutilwm xwayland ]
+5 -49
pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix
··· 1 1 { fetchFromGitLab 2 - , hyprland 3 2 , wlroots 4 - , lib 5 3 , libdisplay-info 6 4 , libliftoff 7 5 , hwdata 8 - , enableNvidiaPatches ? false 9 6 }: 10 - let 11 - libdisplay-info-new = libdisplay-info.overrideAttrs (old: { 12 - version = "0.1.1+date=2023-03-02"; 13 - src = fetchFromGitLab { 14 - domain = "gitlab.freedesktop.org"; 15 - owner = "emersion"; 16 - repo = old.pname; 17 - rev = "147d6611a64a6ab04611b923e30efacaca6fc678"; 18 - sha256 = "sha256-/q79o13Zvu7x02SBGu0W5yQznQ+p7ltZ9L6cMW5t/o4="; 19 - }; 20 - }); 21 - 22 - libliftoff-new = libliftoff.overrideAttrs (old: { 23 - version = "0.5.0-dev"; 24 - src = fetchFromGitLab { 25 - domain = "gitlab.freedesktop.org"; 26 - owner = "emersion"; 27 - repo = old.pname; 28 - rev = "d98ae243280074b0ba44bff92215ae8d785658c0"; 29 - sha256 = "sha256-DjwlS8rXE7srs7A8+tHqXyUsFGtucYSeq6X0T/pVOc8="; 30 - }; 31 - 32 - NIX_CFLAGS_COMPILE = toString [ 33 - "-Wno-error=sign-conversion" 34 - ]; 35 - }); 36 - in 37 7 wlroots.overrideAttrs 38 8 (old: { 39 9 version = "0.17.0-dev"; ··· 42 12 domain = "gitlab.freedesktop.org"; 43 13 owner = "wlroots"; 44 14 repo = "wlroots"; 45 - rev = "5de9e1a99d6642c2d09d589aa37ff0a8945dcee1"; 46 - hash = "sha256-HXu98PyBMKEWLqiTb8viuLDznud/SdkdJsx5A5CWx7I="; 15 + rev = "5d639394f3e83b01596dcd166a44a9a1a2583350"; 16 + hash = "sha256-7kvyoA91etzVEl9mkA/EJfB6z/PltxX7Xc4gcr7/xlo="; 47 17 }; 48 18 49 - pname = 50 - old.pname 51 - + "-hyprland" 52 - + lib.optionalString enableNvidiaPatches "-nvidia"; 53 - 54 - patches = 55 - (old.patches or [ ]) 56 - ++ (lib.optionals enableNvidiaPatches [ 57 - "${hyprland.src}/nix/patches/wlroots-nvidia.patch" 58 - ]); 59 - 60 - # don't need old.postPatch for hwdata's path in wlroots 0.16 61 - postPatch = lib.optionalString enableNvidiaPatches '' 62 - substituteInPlace render/gles2/renderer.c --replace "glFlush();" "glFinish();" 63 - ''; 19 + pname = "${old.pname}-hyprland"; 64 20 65 21 buildInputs = old.buildInputs ++ [ 66 22 hwdata 67 - libdisplay-info-new 68 - libliftoff-new 23 + libdisplay-info 24 + libliftoff 69 25 ]; 70 26 })