pkgs/hikari: use fork

1 files changed, 10 insertions, 21 deletions

diff --git a/pkgs/hikari.nix b/pkgs/hikari.nix
index afbc335..e096b5a 100644
--- a/pkgs/hikari.nix
+++ b/pkgs/hikari.nix
@@ -1,8 +1,8 @@
-{ lib, stdenv, fetchzip
-, pkg-config, bmake
+{ lib, stdenv, fetchgit
+, pkg-config
 , cairo, glib, libevdev, libinput, libxkbcommon, linux-pam, pango, pixman
 , libucl, wayland, wayland-protocols, wayland-scanner, wlroots, mesa
-, libdrm, libgbm
+, libdrm, libgbm, ninja, libxcb-wm, meson
 , features ? {
     gammacontrol = true;
     layershell   = true;
@@ -13,14 +13,15 @@
 
 stdenv.mkDerivation rec {
   pname = "hikari";
-  version = "2.3.3";
+  version = "3.0.0";
 
-  src = fetchzip {
-    url = "https://hikari.acmelabs.space/releases/${pname}-${version}.tar.gz";
-    sha256 = "sha256-5Ug0U3ESC5F/gj7bahnLYkeY/weSCj0QASwdFuWwdMI=";
+  src = fetchgit {
+    url = "https://codeberg.org/thomasadam/hikari";
+    rev = version;
+    hash = "sha256-gcD0VYIqGoArvRcDpS0BYGDwuxVJZYQpuvv0is6dozM=";
   };
 
-  nativeBuildInputs = [ pkg-config bmake ];
+  nativeBuildInputs = [ pkg-config meson ninja ];
 
   buildInputs = [
     cairo
@@ -28,6 +29,7 @@ stdenv.mkDerivation rec {
     libevdev
     libinput
     libxkbcommon
+    libxcb-wm
     libdrm
     libgbm
     linux-pam
@@ -41,22 +43,9 @@ stdenv.mkDerivation rec {
     wlroots
   ];
 
-  patches = [ ./patches/hikari-gtk4.patch ];
-
   enableParallelBuilding = true;
 
-  makeFlags = with lib; [ "PREFIX=$(out)" "DEBUG=YES" ]
-    ++ optional stdenv.isLinux "WITH_POSIX_C_SOURCE=YES"
-    ++ mapAttrsToList (feat: enabled:
-         optionalString enabled "WITH_${toUpper feat}=YES"
-       ) features;
-
   postPatch = ''
-    # Can't suid in nix store
-    # Run hikari as root (it will drop privileges as early as possible), or create
-    # a systemd unit to give it the necessary permissions/capabilities.
-    substituteInPlace Makefile --replace '4555' '555'
-
     sed -i 's@<drm_fourcc.h>@<libdrm/drm_fourcc.h>@' src/*.c
   '';