diff options
| author | Silvan Mosberger <contact@infinisil.com> | 2020-01-26 15:55:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-26 15:55:27 +0100 |
| commit | 3c5add99f67954d04b3538436a41d153cda94bf3 (patch) | |
| tree | 27900d833f2266828caa3f64e5fdde703488f6e1 /pkgs/applications | |
| parent | 8c45e95bb4e87834e185c18115dbb6bf1653aa6f (diff) | |
| parent | cae1bf667f372e9b89f5230ba7395aeed7f2ad8b (diff) | |
| download | nixlib-3c5add99f67954d04b3538436a41d153cda94bf3.tar nixlib-3c5add99f67954d04b3538436a41d153cda94bf3.tar.gz nixlib-3c5add99f67954d04b3538436a41d153cda94bf3.tar.bz2 nixlib-3c5add99f67954d04b3538436a41d153cda94bf3.tar.lz nixlib-3c5add99f67954d04b3538436a41d153cda94bf3.tar.xz nixlib-3c5add99f67954d04b3538436a41d153cda94bf3.tar.zst nixlib-3c5add99f67954d04b3538436a41d153cda94bf3.zip | |
Merge pull request #78481 from Infinisil/mumble-celt
mumble: Fix PLUGIN_PATH definition so it can find the CELT library
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/networking/mumble/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index dfb49e14133f..86ef850e291e 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -37,12 +37,12 @@ let "CONFIG+=bundled-celt" "CONFIG+=no-bundled-opus" "CONFIG+=no-bundled-speex" + "DEFINES+=PLUGIN_PATH=${placeholder "out"}/lib/mumble" ] ++ optional (!speechdSupport) "CONFIG+=no-speechd" ++ optional jackSupport "CONFIG+=no-oss CONFIG+=no-alsa CONFIG+=jackaudio" ++ (overrides.configureFlags or [ ]); preConfigure = '' - qmakeFlags="$qmakeFlags DEFINES+=PLUGIN_PATH=$out/lib/mumble" patchShebangs scripts ''; @@ -66,7 +66,7 @@ let description = "Low-latency, high quality voice chat software"; homepage = "https://mumble.info"; license = licenses.bsd3; - maintainers = with maintainers; [ petabyteboy ]; + maintainers = with maintainers; [ petabyteboy infinisil ]; platforms = platforms.linux; }; }); |