diff options
Diffstat (limited to 'pkgs/applications/window-managers/river/default.nix')
| -rw-r--r-- | pkgs/applications/window-managers/river/default.nix | 65 |
1 files changed, 46 insertions, 19 deletions
diff --git a/pkgs/applications/window-managers/river/default.nix b/pkgs/applications/window-managers/river/default.nix index 5c20bd17fc72..5c02484236c4 100644 --- a/pkgs/applications/window-managers/river/default.nix +++ b/pkgs/applications/window-managers/river/default.nix @@ -1,44 +1,71 @@ -{ lib, stdenv ,fetchFromGitHub -, zig, wayland, pkg-config, scdoc -, xwayland, wayland-protocols, wlroots -, libxkbcommon, pixman, udev, libevdev, libX11, libGL +{ lib +, stdenv +, fetchFromGitHub +, zig +, wayland +, pkg-config +, scdoc +, xwayland +, wayland-protocols +, wlroots +, libxkbcommon +, pixman +, udev +, libevdev +, libX11 +, libGL }: stdenv.mkDerivation rec { pname = "river"; - version = "unstable-2021-04-08"; + version = "unstable-2021-05-07"; src = fetchFromGitHub { owner = "ifreund"; - repo = "river"; - rev = "9e3e92050e04320949c6cd995273c30319ebd515"; - sha256 = "1v8dpbadsb3c7bc84sai09dbqv5s5s5d77vs12kdkd45x0ppmk3j"; + repo = pname; + rev = "7ffa2f4b9e7abf7d152134f555373c2b63ccfc1d"; + sha256 = "1z5qjid73lfn654f2k74nwgvpr88fpdfpbzhihybx9cyy1mqfz7j"; fetchSubmodules = true; }; - buildInputs = [ xwayland wayland-protocols wlroots pixman - libxkbcommon pixman udev libevdev libX11 libGL + nativeBuildInputs = [ zig wayland xwayland scdoc pkg-config ]; + + buildInputs = [ + wayland-protocols + wlroots + pixman + libxkbcommon + pixman + udev + libevdev + libX11 + libGL ]; + dontConfigure = true; + preBuild = '' export HOME=$TMPDIR ''; - installPhase = '' - zig build -Drelease-safe -Dxwayland -Dman-pages --prefix $out install - ''; - nativeBuildInputs = [ zig wayland scdoc pkg-config ]; + installPhase = '' + runHook preInstall + zig build -Drelease-safe -Dtarget=${stdenv.hostPlatform.parsed.cpu.name}-native -Dxwayland -Dman-pages --prefix $out install + runHook postInstall + ''; + /* + Builder patch install dir into river to get default config + When installFlags is removed, river becomes half broken. + See https://github.com/ifreund/river/blob/7ffa2f4b9e7abf7d152134f555373c2b63ccfc1d/river/main.zig#L56 + */ installFlags = [ "DESTDIR=$(out)" ]; meta = with lib; { - description = "A dynamic tiling wayland compositor"; - longDescription = '' - river is a dynamic tiling wayland compositor that takes inspiration from dwm and bspwm. - ''; homepage = "https://github.com/ifreund/river"; + description = "A dynamic tiling wayland compositor"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ branwright1 ]; + maintainers = with maintainers; [ fortuneteller2k ]; }; } |