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

Merge staging-next-21.05 into staging-21.05

This commit is contained in:
github-actions[bot] 2021-08-08 00:03:44 +00:00 committed by GitHub
parent cf38c80016 238870ee1c
commit 3801c0f13b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/libraries/SDL_Pango/default.nix
View File

@ -18,6 +18,7 @@ stdenv.mkDerivation rec {
]; ];
preConfigure = "autoreconf -i -f"; preConfigure = "autoreconf -i -f";
configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest";
nativeBuildInputs = [ pkg-config autoreconfHook ]; nativeBuildInputs = [ pkg-config autoreconfHook ];
buildInputs = [ SDL pango ]; buildInputs = [ SDL pango ];

12
pkgs/servers/mautrix-whatsapp/default.nix
View File

@ -2,18 +2,18 @@
buildGoModule rec { buildGoModule rec {
pname = "mautrix-whatsapp"; pname = "mautrix-whatsapp";
version = "0.1.7"; version = "0.1.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tulir"; owner = "mautrix";
repo = "mautrix-whatsapp"; repo = "whatsapp";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-PXahSrA+jBWreFhqCp1Ar9yYfIJGJfU2xH88Ax3fdkE="; sha256 = "bFuJa4pKwqQmpJDqYwA97CjrTeQ1Q8V/pNqD0ff6x/U=";
}; };
buildInputs = [ olm ]; buildInputs = [ olm ];
vendorSha256 = "sha256-Iscojrn6wVnweOQV1GvhZ4QjUdTfDLOsCP1hVR4u/b4="; vendorSha256 = "NTORR0ixVozUllWlGziTUSJNy1zHoPWQMZbmPUchpQ0=";
doCheck = false; doCheck = false;
@ -22,7 +22,7 @@ buildGoModule rec {
meta = with lib; { meta = with lib; {
homepage = "https://github.com/tulir/mautrix-whatsapp"; homepage = "https://github.com/tulir/mautrix-whatsapp";
description = "Matrix <-> Whatsapp hybrid puppeting/relaybot bridge"; description = "Matrix <-> Whatsapp hybrid puppeting/relaybot bridge";
license = licenses.agpl3; license = licenses.agpl3Plus;
maintainers = with maintainers; [ vskilet ma27 ]; maintainers = with maintainers; [ vskilet ma27 ];
}; };
} }