diff options
Diffstat (limited to '')
| -rw-r--r-- | pkgs/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/hikari.nix | 31 | ||||
| -rw-r--r-- | pkgs/overlay.nix | 11 |
3 files changed, 16 insertions, 37 deletions
diff --git a/pkgs/default.nix b/pkgs/default.nix index ce35fc2..2eeaf7c 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -2,12 +2,11 @@ { inherit (nixpkgs) - galmon-core galmon-full almanac rustex - kijetesantakaluotokieni showrt isabelle-utils isabat - travelynx crs-tracker crs-php bahnhof-name matrix-to - hikari_unstable heartwood radicle-interface radicle-tui - inweb nomsring bookwyrm mollysocket git-annex-remote-remarkable2 - ntfy-matrix-bot transport_validator mergiraf git-who plover plover-dev; + galmon-core galmon-full almanac rustex kijetesantakaluotokieni showrt + isabelle-utils isabat travelynx crs-tracker crs-php bahnhof-name matrix-to + hikari heartwood radicle-interface radicle-tui inweb nomsring bookwyrm + mollysocket git-annex-remote-remarkable2 ntfy-matrix-bot transport_validator + mergiraf git-who plover plover-dev; pkgs = nixpkgs; } 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 ''; diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix index f76496e..a0fe7bf 100644 --- a/pkgs/overlay.nix +++ b/pkgs/overlay.nix @@ -265,13 +265,6 @@ in #### sporadically maintained / updated #### - 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; }; twelf = super.twelf.overrideAttrs (old: { src = self.fetchFromGitHub { owner = "k4rtik"; @@ -305,9 +298,7 @@ in }; - hikari = self.callPackage ./hikari.nix { wlroots = self.wlroots_0_15; }; - - wlroots_0_15 = self.callPackage ./wlroots_0_15.nix {}; + hikari = self.callPackage ./hikari.nix { }; travelynx = self.callPackage ./travelynx.nix {}; |