public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #78481 from Infinisil/mumble-celt 

mumble: Fix PLUGIN_PATH definition so it can find the CELT library
This commit is contained in:
Silvan Mosberger 2020-01-26 15:55:27 +01:00 committed by GitHub
parent 8c45e95bb4 cae1bf667f
commit 3c5add99f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,12 +37,12 @@ let
"CONFIG+=bundled-celt" "CONFIG+=bundled-celt"
"CONFIG+=no-bundled-opus" "CONFIG+=no-bundled-opus"
"CONFIG+=no-bundled-speex" "CONFIG+=no-bundled-speex"
"DEFINES+=PLUGIN_PATH=${placeholder "out"}/lib/mumble"
] ++ optional (!speechdSupport) "CONFIG+=no-speechd" ] ++ optional (!speechdSupport) "CONFIG+=no-speechd"
++ optional jackSupport "CONFIG+=no-oss CONFIG+=no-alsa CONFIG+=jackaudio" ++ optional jackSupport "CONFIG+=no-oss CONFIG+=no-alsa CONFIG+=jackaudio"
++ (overrides.configureFlags or [ ]); ++ (overrides.configureFlags or [ ]);
preConfigure = '' preConfigure = ''
qmakeFlags="$qmakeFlags DEFINES+=PLUGIN_PATH=$out/lib/mumble"
patchShebangs scripts patchShebangs scripts
''; '';
@ -66,7 +66,7 @@ let
description = "Low-latency, high quality voice chat software"; description = "Low-latency, high quality voice chat software";
homepage = "https://mumble.info"; homepage = "https://mumble.info";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = with maintainers; [ petabyteboy ]; maintainers = with maintainers; [ petabyteboy infinisil ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
}); });