From 7eb91a2e248410c76e37de56f123f73180bda776 Mon Sep 17 00:00:00 2001
From: branwright1 <ignacy423@gmail.com>
Date: Wed, 14 Apr 2021 03:33:36 +0100
Subject: [PATCH 1/2] river: init at master

river: init at unstable 2021-04-08

river: init at unstable 2021-04-08

Co-authored-by: fortuneteller2k <20619776+fortuneteller2k@users.noreply.github.com>
---
 .../window-managers/river/default.nix         | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 pkgs/applications/window-managers/river/default.nix

diff --git a/pkgs/applications/window-managers/river/default.nix b/pkgs/applications/window-managers/river/default.nix
new file mode 100644
index 00000000000..52d5db6347b
--- /dev/null
+++ b/pkgs/applications/window-managers/river/default.nix
@@ -0,0 +1,39 @@
+{ lib, stdenv ,fetchFromGitHub
+, zig, pkg-config, scdoc
+, wayland ,xwayland, wayland-protocols, wlroots
+, libxkbcommon, pixman, libudev, libevdev, libX11, libGL
+}:
+
+stdenv.mkDerivation rec {
+  name = "river";
+
+  src = fetchFromGitHub {
+    owner = "ifreund";
+    repo = "river";
+    rev = "9e3e92050e04320949c6cd995273c30319ebd515";
+    sha256 = "1v8dpbadsb3c7bc84sai09dbqv5s5s5d77vs12kdkd45x0ppmk3j";
+    fetchSubmodules = true;
+  };
+
+  buildInputs = [ wayland xwayland wayland-protocols wlroots pixman
+    libxkbcommon pixman libudev libevdev libX11 libGL
+  ];
+
+  preBuild = "export HOME=$TMPDIR;";
+  installPhase = "zig build -Drelease-safe -Dxwayland -Dman-pages --prefix $out install";
+
+  nativeBuildInputs = [ zig scdoc pkg-config ];
+
+  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";
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ branwright1 ];
+  };
+}

From 3943b3ddf21bda0ac2f97cce8bc079b22eb4e402 Mon Sep 17 00:00:00 2001
From: branwright1 <ignacy423@gmail.com>
Date: Wed, 14 Apr 2021 06:30:03 +0100
Subject: [PATCH 2/2] 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
---
 maintainers/maintainer-list.nix               |  6 +++++
 .../window-managers/river/default.nix         | 25 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 8f447405c2a..d4230cf2b3d 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1364,6 +1364,12 @@
     githubId = 302429;
     name = "Marton Boros";
   };
+  branwright1 = {
+    email = "branwright@protonmail.com";
+    github = "branwright1";
+    githubId = 71175207;
+    name = "Brandon Wright";
+  };
   bramd = {
     email = "bram@bramd.nl";
     github = "bramd";
diff --git a/pkgs/applications/window-managers/river/default.nix b/pkgs/applications/window-managers/river/default.nix
index 52d5db6347b..5c20bd17fc7 100644
--- a/pkgs/applications/window-managers/river/default.nix
+++ b/pkgs/applications/window-managers/river/default.nix
@@ -1,11 +1,12 @@
 { lib, stdenv ,fetchFromGitHub
-, zig, pkg-config, scdoc
-, wayland ,xwayland, wayland-protocols, wlroots
-, libxkbcommon, pixman, libudev, libevdev, libX11, libGL
+, zig, wayland, pkg-config, scdoc
+, xwayland, wayland-protocols, wlroots
+, libxkbcommon, pixman, udev, libevdev, libX11, libGL
 }:
 
 stdenv.mkDerivation rec {
-  name = "river";
+  pname = "river";
+  version = "unstable-2021-04-08";
 
   src = fetchFromGitHub {
     owner = "ifreund";
@@ -15,21 +16,25 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
-  buildInputs = [ wayland xwayland wayland-protocols wlroots pixman
-    libxkbcommon pixman libudev libevdev libX11 libGL
+  buildInputs = [ xwayland wayland-protocols wlroots pixman
+    libxkbcommon pixman udev libevdev libX11 libGL
   ];
 
-  preBuild = "export HOME=$TMPDIR;";
-  installPhase = "zig build -Drelease-safe -Dxwayland -Dman-pages --prefix $out install";
+  preBuild = ''
+    export HOME=$TMPDIR
+  '';
+  installPhase = ''
+    zig build -Drelease-safe -Dxwayland -Dman-pages --prefix $out install
+   '';
 
-  nativeBuildInputs = [ zig scdoc pkg-config ];
+  nativeBuildInputs = [ zig wayland scdoc pkg-config ];
 
   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.
+      river is a dynamic tiling wayland compositor that takes inspiration from dwm and bspwm.
     '';
     homepage = "https://github.com/ifreund/river";
     license = licenses.gpl3Plus;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9cbea851c52..50d16949d8b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2912,6 +2912,8 @@ in
 
   psrecord = python3Packages.callPackage ../tools/misc/psrecord {};
 
+  river = callPackage ../applications/window-managers/river { };
+
   rmapi = callPackage ../applications/misc/remarkable/rmapi { };
 
   rmview = libsForQt5.callPackage ../applications/misc/remarkable/rmview { };