git.iko.soy/typeable/nixpkgs
on master help sign in
maintainers: add branwright1

river: init at unstable 2021-04-08 river: init at unstable 2021-04-08 river: init at unstable 2021-04-08 river: init at unstable 2021-04-08 river: init at unstable 2021-04-08 river: init at unstable 2021-04-08 river: init at unstable 2021-04-08

commit3943b3ddf21bda0ac2f97cce8bc079b22eb4e402 authorbranwright1 <ignacy423@gmail.com> dateWed 14 Apr 2021, 06:30 (6 years ago) parent7eb91a2
3 files changed+23−10
compare with master
unifiedsplit
maintainers/maintainer-list.nix+6 pkgs/applications/window-managers/river/default.nix+15−10 pkgs/top-level/all-packages.nix+2
maintainers/maintainer-list.nix+6
@@ -1364,6 +1364,12 @@
13641364 githubId = 302429;
13651365 name = "Marton Boros";
13661366 };
1367+ branwright1 = {
1368+ email = "branwright@protonmail.com";
1369+ github = "branwright1";
1370+ githubId = 71175207;
1371+ name = "Brandon Wright";
1372+ };
13671373 bramd = {
13681374 email = "bram@bramd.nl";
13691375 github = "bramd";
pkgs/applications/window-managers/river/default.nix+15−10
@@ -1,11 +1,12 @@
11{ lib, stdenv ,fetchFromGitHub
2−, zig, pkg-config, scdoc
3−, wayland ,xwayland, wayland-protocols, wlroots
4−, libxkbcommon, pixman, libudev, libevdev, libX11, libGL
2+, zig, wayland, pkg-config, scdoc
3+, xwayland, wayland-protocols, wlroots
4+, libxkbcommon, pixman, udev, libevdev, libX11, libGL
55}:
66
77stdenv.mkDerivation rec {
8− name = "river";
8+ pname = "river";
9+ version = "unstable-2021-04-08";
910
1011 src = fetchFromGitHub {
1112 owner = "ifreund";
@@ -15,21 +16,25 @@ stdenv.mkDerivation rec {
1516 fetchSubmodules = true;
1617 };
1718
18− buildInputs = [ wayland xwayland wayland-protocols wlroots pixman
19− libxkbcommon pixman libudev libevdev libX11 libGL
19+ buildInputs = [ xwayland wayland-protocols wlroots pixman
20+ libxkbcommon pixman udev libevdev libX11 libGL
2021 ];
2122
22− preBuild = "export HOME=$TMPDIR;";
23− installPhase = "zig build -Drelease-safe -Dxwayland -Dman-pages --prefix $out install";
23+ preBuild = ''
24+ export HOME=$TMPDIR
25+ '';
26+ installPhase = ''
27+ zig build -Drelease-safe -Dxwayland -Dman-pages --prefix $out install
28+ '';
2429
25− nativeBuildInputs = [ zig scdoc pkg-config ];
30+ nativeBuildInputs = [ zig wayland scdoc pkg-config ];
2631
2732 installFlags = [ "DESTDIR=$(out)" ];
2833
2934 meta = with lib; {
3035 description = "A dynamic tiling wayland compositor";
3136 longDescription = ''
32− river is a dynamic tiling wayland compositor that takes inspiration from dwm and bspwm.
37+ river is a dynamic tiling wayland compositor that takes inspiration from dwm and bspwm.
3338 '';
3439 homepage = "https://github.com/ifreund/river";
3540 license = licenses.gpl3Plus;
pkgs/top-level/all-packages.nix+2
@@ -2912,6 +2912,8 @@ in
29122912
29132913 psrecord = python3Packages.callPackage ../tools/misc/psrecord {};
29142914
2915+ river = callPackage ../applications/window-managers/river { };
2916+
29152917 rmapi = callPackage ../applications/misc/remarkable/rmapi { };
29162918
29172919 rmview = libsForQt5.callPackage ../applications/misc/remarkable/rmview { };