diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/window-managers/hikari/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/applications/window-managers/hikari/default.nix | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/nixpkgs/pkgs/applications/window-managers/hikari/default.nix b/nixpkgs/pkgs/applications/window-managers/hikari/default.nix index 2325deaf37cb..34016b0d7565 100644 --- a/nixpkgs/pkgs/applications/window-managers/hikari/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/hikari/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchzip, pkg-config, bmake, cairo, glib, libevdev, libinput, libxkbcommon, linux-pam, pango, pixman, - libucl, wayland, wayland-protocols, wlroots, + libucl, wayland, wayland-protocols, wlroots, mesa, features ? { gammacontrol = true; layershell = true; @@ -35,6 +35,7 @@ stdenv.mkDerivation { pango pixman libucl + mesa # for libEGL wayland wayland-protocols wlroots @@ -42,14 +43,11 @@ stdenv.mkDerivation { enableParallelBuilding = true; - # Must replace GNU Make by bmake - buildPhase = with lib; concatStringsSep " " ( - [ "bmake" "-j$NIX_BUILD_CORES" "PREFIX=$out" ] + makeFlags = with lib; [ "PREFIX=$(out)" ] ++ optional stdenv.isLinux "WITH_POSIX_C_SOURCE=YES" ++ mapAttrsToList (feat: enabled: optionalString enabled "WITH_${toUpper feat}=YES" - ) features - ); + ) features; # Can't suid in nix store # Run hikari as root (it will drop privileges as early as possible), or create @@ -58,13 +56,6 @@ stdenv.mkDerivation { substituteInPlace Makefile --replace '4555' '555' ''; - installPhase = '' - bmake \ - PREFIX=$out \ - install - runHook postInstall - ''; - meta = with lib; { description = "Stacking Wayland compositor which is actively developed on FreeBSD but also supports Linux"; homepage = "https://hikari.acmelabs.space"; |