diff options
| author | Anderson Torres <torres.anderson.85@protonmail.com> | 2022-12-28 17:31:48 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-28 17:31:48 -0300 |
| commit | 4032717bd12d53da0087af90996fc21cefe7c7a7 (patch) | |
| tree | 4cc1b3cb9eab3725165360f28a02d33ad9f3751a | |
| parent | 8841ea8f267ab3a8792e846ae115893d4ffaa89a (diff) | |
| parent | f955d78e27ecfc7f66d3d141a309de2d77095747 (diff) | |
Merge pull request #208109 from wegank/hypr-darwin
hypr: unbreak on darwin
| -rw-r--r-- | pkgs/applications/window-managers/hyprwm/hypr/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 18 insertions, 2 deletions
diff --git a/pkgs/applications/window-managers/hyprwm/hypr/default.nix b/pkgs/applications/window-managers/hyprwm/hypr/default.nix index 673fa90c5005b..2485552fce6ea 100644 --- a/pkgs/applications/window-managers/hyprwm/hypr/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hypr/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cairo , cmake , glib @@ -15,6 +16,7 @@ , xcbutilcursor , xcbutilkeysyms , xcbutilwm +, xcbutil , xmodmap }: @@ -31,6 +33,15 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./000-dont-set-compiler.diff + # TODO: remove on next release + (fetchpatch { + url = "https://github.com/hyprwm/Hypr/commit/08d6af2caf882247943f0e8518ad782f35d1aba4.patch"; + sha256 = "sha256-WjR12ZH8CE+l9xSeQUAPYW5r5HzoPpod5YqDPJTdTY8="; + }) + (fetchpatch { + url = "https://github.com/hyprwm/Hypr/commit/7512a3ab91865b1e11b8c4a9dfdffb25c2b153de.patch"; + sha256 = "sha256-0Hq5n115z0U44op7A1FO9tUOeMEPV0QgD5E5zcmend0="; + }) ]; nativeBuildInputs = [ @@ -51,8 +62,12 @@ stdenv.mkDerivation (finalAttrs: { xcbutilcursor xcbutilkeysyms xcbutilwm + xcbutil ]; + # src/ewmh/ewmh.cpp:67:28: error: non-constant-expression cannot be narrowed from type 'int' to 'uint32_t' (aka 'unsigned int') in initializer list + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-c++11-narrowing"; + installPhase = '' runHook preInstall @@ -71,7 +86,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.bsd3; maintainers = with maintainers; [ AndersonTorres ]; inherit (libX11.meta) platforms; - broken = stdenv.isDarwin; # xcb/xcb_atom.h not found mainProgram = "Hypr"; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 23a163d95d271..36b407f2d5dd3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4773,7 +4773,9 @@ with pkgs; hunt = callPackage ../tools/misc/hunt { }; - hypr = callPackage ../applications/window-managers/hyprwm/hypr { }; + hypr = callPackage ../applications/window-managers/hyprwm/hypr { + cairo = cairo.override { xcbSupport = true; }; + }; hyprland = callPackage ../applications/window-managers/hyprwm/hyprland { stdenv = gcc11Stdenv; |