From 95ca86f925f578d80b2fc6d6ea559456e0ab1bf1 Mon Sep 17 00:00:00 2001
From: Robbert Gurdeep Singh <git@beardhatcode.be>
Date: Fri, 12 Nov 2021 23:57:51 +0100
Subject: [PATCH 1/3] nextcloud22: 22.2.1 -> 22.2.2

This includes a fix for a preformance regression:
https://github.com/nextcloud/server/pull/29682
---
 pkgs/servers/nextcloud/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index b6b2cd1ea65d..9c6e3a22122a 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -51,8 +51,8 @@ in {
   };
 
   nextcloud22 = generic {
-    version = "22.2.1";
-    sha256 = "sha256-0BtQt7siUYGiEVGkUYmd0gjfccq4kIhCVaOTR9frvys=";
+    version = "22.2.2";
+    sha256 = "sha256-lDvn29N19Lhm3P2YIVM/85vr/U07qR+M8TkF/D/GTfA=";
   };
   # tip: get she sha with:
   # curl 'https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256'

From dd8b662bf56a5f441faf6751120c7d8277a928d1 Mon Sep 17 00:00:00 2001
From: Ellie Hermaszewska <git@monoid.al>
Date: Thu, 11 Nov 2021 18:03:43 +0800
Subject: [PATCH 2/3] monado: build with libbsd

This is an optional dependency, the presence of which allows monado to
remove stale lock files.
---
 pkgs/applications/graphics/monado/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/graphics/monado/default.nix b/pkgs/applications/graphics/monado/default.nix
index 219613ad0ce5..028066427951 100644
--- a/pkgs/applications/graphics/monado/default.nix
+++ b/pkgs/applications/graphics/monado/default.nix
@@ -19,6 +19,7 @@
 , libXau
 , libXdmcp
 , libXrandr
+, libbsd
 , libffi
 , libjpeg
 # , librealsense
@@ -88,6 +89,7 @@ stdenv.mkDerivation rec {
     libXau
     libXdmcp
     libXrandr
+    libbsd
     libjpeg
     libffi
     # librealsense.dev - see below

From f745b93d86b51003f7c3e179211de777c4bfd1cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Sat, 13 Nov 2021 12:19:32 +0100
Subject: [PATCH 3/3] tree: fix package

makeFlags seems to be escaped now, so to do CC=$CC we need to
append it to makeFlags in the shell script now

Otherwise we get CC=\$CC
---
 pkgs/tools/system/tree/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/system/tree/default.nix b/pkgs/tools/system/tree/default.nix
index 5bfe5c9ac755..0b19bd576874 100644
--- a/pkgs/tools/system/tree/default.nix
+++ b/pkgs/tools/system/tree/default.nix
@@ -30,12 +30,12 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     sed -i Makefile -e 's|^OBJS=|OBJS=$(EXTRA_OBJS) |'
+    makeFlags+=("CC=$CC")
   '';
 
   makeFlags = [
     "prefix=${placeholder "out"}"
     "MANDIR=${placeholder "out"}/share/man/man1"
-    "CC=$CC"
     systemFlags
   ];