Merge pull request #1321 from wkennington/mumble
Break mumble into client and server components
This commit is contained in:
commit
990d9684a4
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, qt4, libvorbis, boost, speechd, protobuf, libsndfile,
|
||||
avahi, dbus, libcap, pkgconfig,
|
||||
{ stdenv, fetchurl, qt4, boost, speechd, protobuf, libsndfile,
|
||||
speex, libopus, avahi, pkgconfig
|
||||
jackSupport ? false,
|
||||
jackaudio ? null }:
|
||||
|
||||
@ -18,16 +18,18 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
configurePhase = ''
|
||||
qmake CONFIG+=no-g15 CONFIG+=no-update \
|
||||
CONFIG+=no-embed-qt-translations CONFIG+=no-ice \
|
||||
qmake CONFIG+=no-g15 CONFIG+=no-update CONFIG+=no-server \
|
||||
CONFIG+=no-embed-qt-translations CONFIG+=packaged \
|
||||
CONFIG+=bundled-celt CONFIG+=no-bundled-opus \
|
||||
CONFIG+=no-bundled-speex
|
||||
''
|
||||
+ stdenv.lib.optionalString jackSupport ''
|
||||
CONFIG+=no-oss CONFIG+=no-alsa CONFIG+=jackaudio
|
||||
'';
|
||||
|
||||
|
||||
buildInputs = [ qt4 libvorbis boost speechd protobuf libsndfile avahi dbus
|
||||
libcap pkgconfig ]
|
||||
buildInputs = [ qt4 boost speechd protobuf libsndfile speex
|
||||
libopus avahi pkgconfig ]
|
||||
++ (stdenv.lib.optional jackSupport jackaudio);
|
||||
|
||||
installPhase = ''
|
||||
|
30
pkgs/applications/networking/mumble/murmur.nix
Normal file
30
pkgs/applications/networking/mumble/murmur.nix
Normal file
@ -0,0 +1,30 @@
|
||||
{ stdenv, fetchurl, qt4, boost, protobuf, avahi, libcap, pkgconfig }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "murmur-" + version;
|
||||
version = "1.2.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/mumble/mumble-${version}.tar.gz";
|
||||
sha256 = "16wwj6gwcnyjlnzh7wk0l255ldxmbwx0wi652sdp20lsv61q7kx1";
|
||||
};
|
||||
|
||||
configurePhase = ''
|
||||
qmake CONFIG+=no-client CONFIG+=no-ice CONFIG+=no-embed-qt
|
||||
'';
|
||||
|
||||
buildInputs = [ qt4 boost protobuf avahi libcap pkgconfig ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
cp -r ./release $out/bin
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://mumble.sourceforge.net/;
|
||||
description = "Low-latency, high quality voice chat software";
|
||||
license = "BSD";
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
maintainers = with stdenv.lib.maintainers; [viric];
|
||||
};
|
||||
}
|
@ -37,6 +37,13 @@ stdenv.mkDerivation rec {
|
||||
avahi-core/socket.c
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
# Maintain compat for mdnsresponder and howl
|
||||
${if withLibdnssdCompat then "ln -s avahi-compat-libdns_sd/dns_sd.h $out/include/dns_sd.h" else ""}
|
||||
ln -s avahi-compat-howl $out/include/howl
|
||||
ln -s avahi-compat-howl.pc $out/lib/pkgconfig/howl.pc
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "mDNS/DNS-SD implementation";
|
||||
homepage = http://avahi.org;
|
||||
|
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, fixedPoint ? false }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libopus-1.0.2";
|
||||
name = "libopus-1.0.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://downloads.xiph.org/releases/opus/opus-1.0.2.tar.gz";
|
||||
sha256 = "12npbkrcwvh3fl9l18cwrxwg269cg2j6j7876cc9q0axxvdmwqfs";
|
||||
url = "http://downloads.xiph.org/releases/opus/opus-1.0.3.tar.gz";
|
||||
sha256 = "175l7hv7d03c4iz60g185nqvwrabc39ksil0d7g07i6vjaf0h6hr";
|
||||
};
|
||||
|
||||
configureFlags = stdenv.lib.optionalString fixedPoint "--enable-fixed-point";
|
||||
|
@ -8480,6 +8480,12 @@ let
|
||||
jackSupport = config.mumble.jackSupport or false;
|
||||
};
|
||||
|
||||
murmur = callPackage ../applications/networking/mumble/murmur.nix {
|
||||
avahi = avahi.override {
|
||||
withLibdnssdCompat = true;
|
||||
};
|
||||
};
|
||||
|
||||
mutt = callPackage ../applications/networking/mailreaders/mutt { };
|
||||
|
||||
ruby_gpgme = callPackage ../development/libraries/ruby_gpgme {
|
||||
|
Loading…
x
Reference in New Issue
Block a user