From 21160c8965e3a2523dcefc2847893c2e2f4c7282 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Sat, 25 Jan 2020 21:51:35 +0100 Subject: [PATCH 1/2] mumble: Fix PLUGIN_PATH definition so it can find the CELT library --- pkgs/applications/networking/mumble/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index dfb49e14133f92..fc2f911df9ed46 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 ''; From cae1bf667f372e9b89f5230ba7395aeed7f2ad8b Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Sat, 25 Jan 2020 22:05:14 +0100 Subject: [PATCH 2/2] mumble: Add infinisil as maintainer --- pkgs/applications/networking/mumble/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index fc2f911df9ed46..86ef850e291e4c 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -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; }; });