pyrox.dev
lol
Merge pull request #122368 from branwright1/river
+13
-9
+13
-9
pkgs/applications/window-managers/river/default.nix
+13
-9
pkgs/applications/window-managers/river/default.nix
···
6
6
7
7
stdenv.mkDerivation rec {
8
8
pname = "river";
9
-
version = "unstable-2021-04-27";
9
+
version = "unstable-2021-05-07";
10
10
11
11
src = fetchFromGitHub {
12
12
owner = "ifreund";
13
13
repo = pname;
14
-
rev = "0c8e718d95a6a621b9cba0caa9158915e567b076";
15
-
sha256 = "1jjh0dzxi7hy4mg8vag6ipfwb9qxm5lfc07njp1mx6m81nq76ybk";
14
+
rev = "7ffa2f4b9e7abf7d152134f555373c2b63ccfc1d";
15
+
sha256 = "1z5qjid73lfn654f2k74nwgvpr88fpdfpbzhihybx9cyy1mqfz7j";
16
16
fetchSubmodules = true;
17
17
};
18
18
19
-
buildInputs = [ xwayland wayland-protocols wlroots pixman
19
+
buildInputs = [ wayland-protocols wlroots pixman
20
20
libxkbcommon pixman udev libevdev libX11 libGL
21
21
];
22
22
23
+
dontConfigure = true;
24
+
23
25
preBuild = ''
24
26
export HOME=$TMPDIR
25
27
'';
26
28
installPhase = ''
29
+
runHook preInstall
27
30
zig build -Drelease-safe -Dxwayland -Dman-pages --prefix $out install
31
+
runHook postInstall
28
32
'';
29
33
30
-
nativeBuildInputs = [ zig wayland scdoc pkg-config ];
34
+
nativeBuildInputs = [ zig wayland xwayland scdoc pkg-config ];
31
35
36
+
# Builder patch install dir into river to get default config
37
+
# When installFlags is removed, river becomes half broken
38
+
# see https://github.com/ifreund/river/blob/7ffa2f4b9e7abf7d152134f555373c2b63ccfc1d/river/main.zig#L56
32
39
installFlags = [ "DESTDIR=$(out)" ];
33
40
34
41
meta = with lib; {
42
+
homepage = "https://github.com/ifreund/river";
35
43
description = "A dynamic tiling wayland compositor";
36
-
longDescription = ''
37
-
river is a dynamic tiling wayland compositor that takes inspiration from dwm and bspwm.
38
-
'';
39
-
homepage = "https://github.com/ifreund/river";
40
44
license = licenses.gpl3Plus;
41
45
platforms = platforms.linux;
42
46
maintainers = with maintainers; [ branwright1 ];