alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

mumble: Refactor

Browse source
This commit is contained in:
William A. Kennington III 2015-04-25 23:32:04 -07:00
parent 3cb1669249
commit 03d755aca5
2 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/applications/networking/mumble/default.nix
View file

@ -1,20 +1,20 @@
{ stdenv, fetchurl, pkgconfig
, avahi, boost, libopus, libsndfile, protobuf, qt4, speex
, jackSupport ? false, jack2 ? null
, jackSupport ? false, libjack2 ? null
, speechdSupport ? false, speechd ? null
, pulseSupport ? false, pulseaudio ? null
, pulseSupport ? false, libpulseaudio ? null
}:
assert jackSupport -> jack2 != null;
assert jackSupport -> libjack2 != null;
assert speechdSupport -> speechd != null;
assert pulseSupport -> pulseaudio != null;
assert pulseSupport -> libpulseaudio != null;
let
optional = stdenv.lib.optional;
optionalString = stdenv.lib.optionalString;
in
stdenv.mkDerivation rec {
name = "mumble-" + version;
name = "mumble-${version}";
version = "1.2.8";
src = fetchurl {
@ -44,9 +44,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ avahi boost libopus libsndfile protobuf qt4 speex ]
++ optional jackSupport jack2
++ optional jackSupport libjack2
++ optional speechdSupport speechd
++ optional pulseSupport pulseaudio;
++ optional pulseSupport libpulseaudio;
installPhase = ''
mkdir -p $out

10
pkgs/applications/networking/mumble/murmur.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, qt4, boost, protobuf
{ stdenv, qt4, boost, protobuf, mumble
, avahi, libcap, pkgconfig
, iceSupport ? false
, zeroc_ice ? null
@ -11,13 +11,9 @@ let
optionalString = stdenv.lib.optionalString;
in
stdenv.mkDerivation rec {
name = "murmur-" + version;
version = "1.2.8";
name = "murmur-${version}";
src = fetchurl {
url = "mirror://sourceforge/mumble/mumble-${version}.tar.gz";
sha256 = "0ng1xd7i0951kqnd9visf84y2dcwia79a1brjwfvr1wnykgw6bsc";
};
inherit (mumble) version src;
patchPhase = optional iceSupport ''
sed -i 's,/usr/share/Ice/,${zeroc_ice}/,g' src/murmur/murmur.pro