diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2021-06-26 16:57:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-26 16:57:09 +0200 |
| commit | 0fa98c824a6fe5148809efae47dab078fc292852 (patch) | |
| tree | 20d3449fd7972a2cbbaa39b30012c6232b34c964 /pkgs/applications | |
| parent | 1e125a80022f2d90adc6a6e37c3c358c9976a77e (diff) | |
| parent | 7e0e95b7763440bfdb9b1897f034fe02ce63e7dc (diff) | |
Merge pull request #128122 from primeos/hikari
hikari: Build with wlroots 0.14
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/window-managers/hikari/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/applications/window-managers/hikari/default.nix b/pkgs/applications/window-managers/hikari/default.nix index 23c7d9f680f61..2ec1ff26a793c 100644 --- a/pkgs/applications/window-managers/hikari/default.nix +++ b/pkgs/applications/window-managers/hikari/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, +{ lib, stdenv, fetchzip, fetchpatch, pkg-config, bmake, cairo, glib, libevdev, libinput, libxkbcommon, linux-pam, pango, pixman, libucl, wayland, wayland-protocols, wlroots, mesa, @@ -23,6 +23,15 @@ stdenv.mkDerivation { sha256 = "0vxwma2r9mb2h0c3dkpvf8dbrc2x2ykhc5bb0vd72sl9pwj4jxmy"; }; + patches = [ + # To fix the build with wlroots 0.14.0: + (fetchpatch { + url = "https://cgit.freebsd.org/ports/plain/x11-wm/hikari/files/patch-wlroots-0.14?id=f2820b6cc2170feef17989c422f2cf46644a5b57"; + sha256 = "1kpbcmgdm4clmf2ryrs5pv3ghycnq4glvs3d3ll6zr244ks5yf43"; + extraPrefix = ""; + }) + ]; + nativeBuildInputs = [ pkg-config bmake ]; buildInputs = [ |