cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

hikari: Build with wlroots 0.14

Browse source
This commit is contained in:
Michael Weiss 2021-06-25 18:47:52 +02:00
parent 3734700895
commit 7e0e95b776
No known key found for this signature in database
GPG key ID: 5BE487C4D4771D83
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/applications/window-managers/hikari/default.nix
View file

@ -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 = [

4
pkgs/top-level/all-packages.nix
View file

@ -24578,9 +24578,7 @@ in
wbg = callPackage ../applications/misc/wbg { };
hikari = callPackage ../applications/window-managers/hikari {
wlroots = wlroots_0_13;
};
hikari = callPackage ../applications/window-managers/hikari { };
i3 = callPackage ../applications/window-managers/i3 {
xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor;