diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-08-08 00:03:44 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-08 00:03:44 +0000 |
| commit | 3801c0f13b6eeacf6e2d09e83b4d69516244395c (patch) | |
| tree | ef1050a91a37a77ce4a4e85c1a3bcdca01cae06e | |
| parent | Merge staging-next-21.05 into staging-21.05 (diff) | |
| parent | Merge release-21.05 into staging-next-21.05 (diff) | |
| download | nixpkgs-3801c0f13b6eeacf6e2d09e83b4d69516244395c.tar.gz | |
Merge staging-next-21.05 into staging-21.05
| -rw-r--r-- | pkgs/development/libraries/SDL_Pango/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/servers/mautrix-whatsapp/default.nix | 12 |
2 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/development/libraries/SDL_Pango/default.nix b/pkgs/development/libraries/SDL_Pango/default.nix index 83afeaf2d67b..7c90092fe8dd 100644 --- a/pkgs/development/libraries/SDL_Pango/default.nix +++ b/pkgs/development/libraries/SDL_Pango/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { ]; preConfigure = "autoreconf -i -f"; + configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ SDL pango ]; diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index a5b2f14e9d58..c2f9e206e9cb 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "mautrix-whatsapp"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { - owner = "tulir"; - repo = "mautrix-whatsapp"; + owner = "mautrix"; + repo = "whatsapp"; rev = "v${version}"; - sha256 = "sha256-PXahSrA+jBWreFhqCp1Ar9yYfIJGJfU2xH88Ax3fdkE="; + sha256 = "bFuJa4pKwqQmpJDqYwA97CjrTeQ1Q8V/pNqD0ff6x/U="; }; buildInputs = [ olm ]; - vendorSha256 = "sha256-Iscojrn6wVnweOQV1GvhZ4QjUdTfDLOsCP1hVR4u/b4="; + vendorSha256 = "NTORR0ixVozUllWlGziTUSJNy1zHoPWQMZbmPUchpQ0="; doCheck = false; @@ -22,7 +22,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/tulir/mautrix-whatsapp"; description = "Matrix <-> Whatsapp hybrid puppeting/relaybot bridge"; - license = licenses.agpl3; + license = licenses.agpl3Plus; maintainers = with maintainers; [ vskilet ma27 ]; }; } |