ilex: setup for hikari hacking

3 files changed, 16 insertions, 3 deletions

diff --git a/flake.nix b/flake.nix
index de5bc41..80932c0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -139,7 +139,8 @@
         inherit (nixpkgs)
           galmon-core galmon-full glitchtip typst almanac rustex
           kijetesantakaluotokieni showrt isabelle-utils isabat
-          travelynx crs-tracker crs-php bahnhof-name matrix-to;
+          travelynx crs-tracker crs-php bahnhof-name matrix-to
+          hikari_unstable;
       };
 
       nixosModules = { glitchtip = import ./modules/glitchtip.nix; };
diff --git a/home/unstable.nix b/home/unstable.nix
index c8cef87..00621d4 100644
--- a/home/unstable.nix
+++ b/home/unstable.nix
@@ -1,6 +1,6 @@
 {config, pkgs, inputs, system, ...}:
 
-with import inputs.nixpkgs-unstable {inherit system; };
+with inputs.nixpkgs-unstable.legacyPackages.${system};
 {
   home.packages = [
     dino
@@ -17,7 +17,11 @@ with import inputs.nixpkgs-unstable {inherit system; };
     gleam
     yazi
     nixd
-  ];
+
+    # hikari development
+    pkgs.pandoc # pkgs.xorg.xcbutilwm.dev
+    pkgs.bmake pkgs.pkg-config
+  ]; #++ hikari.buildInputs;
 
   xdg.desktopEntries."Signal" = {
       name = "Signal";
diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix
index 1e357ed..7ca2a21 100644
--- a/pkgs/overlay.nix
+++ b/pkgs/overlay.nix
@@ -104,4 +104,12 @@ in
   matrix-to = self.callPackage ./matrix-to.nix {};
 
   inherit (unstable) lean4;
+
+  hikari_unstable = (unstable.hikari.overrideAttrs (old: {
+    src = /home/stuebinm/clones/hikari;
+    buildInputs = old.buildInputs ++ [ self.pandoc self.xorg.xcbutilwm.dev ]; #self.libdrm self.libdrm.dev ];
+    makeFlags = with self.lib;
+      [ "PREFIX=$(out)" "WITH_POSIX_C_SOURCE=YES"
+        "WITH_GAMMACONTROL=YES" "WITH_LAYERSHELL=YES" "WITH_SCREENCOPY=YES" ];
+  })).override { wlroots = unstable.wlroots_0_16; stdenv = self.clangStdenv; };
 }