diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-04-11 13:46:02 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-04-16 12:56:48 +0000 |
| commit | 952842352e0d77d5fd3589ae7ac496775f8c2e45 (patch) | |
| tree | 50ab488d048e25dec0b1616a14096a0853a96423 /pkgs/applications/window-managers | |
| parent | 53b88f966e01b6a51e40d3298c68be2d22243e3a (diff) | |
| download | nixpkgs-952842352e0d77d5fd3589ae7ac496775f8c2e45.tar nixpkgs-952842352e0d77d5fd3589ae7ac496775f8c2e45.tar.gz nixpkgs-952842352e0d77d5fd3589ae7ac496775f8c2e45.tar.bz2 nixpkgs-952842352e0d77d5fd3589ae7ac496775f8c2e45.tar.lz nixpkgs-952842352e0d77d5fd3589ae7ac496775f8c2e45.tar.xz nixpkgs-952842352e0d77d5fd3589ae7ac496775f8c2e45.tar.zst nixpkgs-952842352e0d77d5fd3589ae7ac496775f8c2e45.zip | |
hikari: use bmake setupHook for build+install phase
Diffstat (limited to 'pkgs/applications/window-managers')
| -rw-r--r-- | pkgs/applications/window-managers/hikari/default.nix | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/pkgs/applications/window-managers/hikari/default.nix b/pkgs/applications/window-managers/hikari/default.nix index 2325deaf37c..614012c4712 100644 --- a/pkgs/applications/window-managers/hikari/default.nix +++ b/pkgs/applications/window-managers/hikari/default.nix @@ -42,14 +42,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 +55,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"; |