colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-11-13 12:01:13 +00:00 committed by GitHub
commit 631c3d7cb2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/graphics/monado/default.nix
View File

@ -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

4
pkgs/servers/nextcloud/default.nix
View File

@ -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'

2
pkgs/tools/system/tree/default.nix
View File

@ -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
];