pyrox.dev / nixpkgs
lol
fork atom

mumble: use our celt library

Nikolay Amiantov 47bb9119 79301503

+6 -3
unified split
+5 -3
pkgs/applications/networking/mumble/default.nix
··· 1 1 { stdenv, fetchurl, pkgconfig 2 - , avahi, boost, libopus, libsndfile, protobuf, qt4, speex 2 + , avahi, boost, libopus, celt, libsndfile, protobuf, qt4, speex 3 3 , jackSupport ? false, libjack2 ? null 4 4 , speechdSupport ? false, speechd ? null 5 5 , pulseSupport ? false, libpulseaudio ? null ··· 31 31 "CONFIG+=no-update" 32 32 "CONFIG+=no-server" 33 33 "CONFIG+=no-embed-qt-translations" 34 - "CONFIG+=bundled-celt" 34 + "CONFIG+=no-bundled-celt" 35 35 "CONFIG+=no-bundled-opus" 36 36 "CONFIG+=no-bundled-speex" 37 37 ] ++ optional (!speechdSupport) "CONFIG+=no-speechd" ··· 43 43 44 44 nativeBuildInputs = [ pkgconfig ]; 45 45 46 - buildInputs = [ avahi boost libopus libsndfile protobuf qt4 speex ] 46 + NIX_CFLAGS_COMPILE = [ "-I${celt}/include/celt" ]; 47 + 48 + buildInputs = [ avahi boost libopus celt libsndfile protobuf qt4 speex ] 47 49 ++ optional jackSupport libjack2 48 50 ++ optional speechdSupport speechd 49 51 ++ optional pulseSupport libpulseaudio;
+1
pkgs/top-level/all-packages.nix
··· 12124 12124 avahi = avahi.override { 12125 12125 withLibdnssdCompat = true; 12126 12126 }; 12127 + celt = celt_0_7; 12127 12128 jackSupport = config.mumble.jackSupport or false; 12128 12129 speechdSupport = config.mumble.speechdSupport or false; 12129 12130 pulseSupport = config.pulseaudio or false;