diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2020-02-19 08:01:22 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-19 14:01:21 +0100 |
| commit | 7b73eefda84c75f33ce5dc52461b87f9fa992fed (patch) | |
| tree | 66feab9078f8d1f421417176d7e3cf3c518576c6 /pkgs/applications | |
| parent | 5ea19307fe7e331f86bc3676a9c506b6d1c7d3e0 (diff) | |
| download | nixpkgs-7b73eefda84c75f33ce5dc52461b87f9fa992fed.tar nixpkgs-7b73eefda84c75f33ce5dc52461b87f9fa992fed.tar.gz nixpkgs-7b73eefda84c75f33ce5dc52461b87f9fa992fed.tar.bz2 nixpkgs-7b73eefda84c75f33ce5dc52461b87f9fa992fed.tar.lz nixpkgs-7b73eefda84c75f33ce5dc52461b87f9fa992fed.tar.xz nixpkgs-7b73eefda84c75f33ce5dc52461b87f9fa992fed.tar.zst nixpkgs-7b73eefda84c75f33ce5dc52461b87f9fa992fed.zip | |
mumble: fix build (#80500)
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/networking/mumble/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/networking/mumble/fix-rnnoise-argument.patch | 16 |
2 files changed, 19 insertions, 1 deletions
diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 86ef850e291..da7c5d4af74 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -19,7 +19,9 @@ let pname = overrides.type; version = source.version; - patches = (source.patches or []) ++ optional jackSupport ./mumble-jack-support.patch; + patches = (source.patches or []) + ++ optional jackSupport ./mumble-jack-support.patch + ++ [ ./fix-rnnoise-argument.patch ]; nativeBuildInputs = [ pkgconfig python qt5.qmake ] ++ (overrides.nativeBuildInputs or [ ]); diff --git a/pkgs/applications/networking/mumble/fix-rnnoise-argument.patch b/pkgs/applications/networking/mumble/fix-rnnoise-argument.patch new file mode 100644 index 00000000000..78e8ed24d58 --- /dev/null +++ b/pkgs/applications/networking/mumble/fix-rnnoise-argument.patch @@ -0,0 +1,16 @@ +nixpkgs has a more recent rnnoise than the one used by mumble, and rnnoise +changed the argument rnnoise_create[1], + +[1] https://github.com/xiph/rnnoise/commit/231b9c02d14a74cb449a98004cb7a2cf1bdeca2f + +--- old/src/mumble/AudioInput.cpp 2020-02-18 22:55:32.000000000 -0500 ++++ new/src/mumble/AudioInput.cpp 2020-02-18 22:58:08.000000000 -0500 +@@ -106,7 +106,7 @@ + #endif + + #ifdef USE_RNNOISE +- denoiseState = rnnoise_create(); ++ denoiseState = rnnoise_create(NULL); + #endif + + qWarning("AudioInput: %d bits/s, %d hz, %d sample", iAudioQuality, iSampleRate, iFrameSize); |