dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #200229 from raphaelr/mumble

Browse Source
This commit is contained in:
Martin Weinelt 2022-11-09 22:59:51 +01:00 committed by GitHub
commit 633b3b8db1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/applications/networking/mumble/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, qt5, cmake { lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, qt5, cmake
, avahi, boost, libopus, libsndfile, protobuf, speex, libcap , avahi, boost, libopus, libsndfile, protobuf, speex, libcap
, alsa-lib, python3 , alsa-lib, python3
, rnnoise , rnnoise
@ -108,6 +108,17 @@ let
sha256 = "sha256-SYsGCuj3HeyAQRUecGLaRdJR9Rm7lbaM54spY/zx0jU="; sha256 = "sha256-SYsGCuj3HeyAQRUecGLaRdJR9Rm7lbaM54spY/zx0jU=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
patches = [
# fixes 'static assertion failed: static_assert(sizeof(CCameraAngles) == 0x408, "");'
# when compiling pkgsi686Linux.mumble, which is a dependency of x64 mumble_overlay
# https://github.com/mumble-voip/mumble/pull/5850
# Remove with next version update
(fetchpatch {
url = "https://github.com/mumble-voip/mumble/commit/13c051b36b387356815cff5d685bc628b74ba136.patch";
hash = "sha256-Rq8fb6NFd4DCNWm6OOMYIP7tBllufmQcB5CSxPU4qqg=";
})
];
}; };
in { in {
mumble = client source; mumble = client source;

1
pkgs/applications/networking/mumble/overlay.nix
View File

@ -8,6 +8,7 @@ in stdenv.mkDerivation {
version = mumble.version; version = mumble.version;
inherit (mumble) src; inherit (mumble) src;
patches = mumble.patches or [];
installPhase = '' installPhase = ''
mkdir -p $out/lib mkdir -p $out/lib