public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki 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 { stdenv, fetchurl, pkgconfig
, avahi, boost, libopus, libsndfile, protobuf, qt4, speex , avahi, boost, libopus, libsndfile, protobuf, qt4, speex
, jackSupport ? false, jack2 ? null , jackSupport ? false, libjack2 ? null
, speechdSupport ? false, speechd ? 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 speechdSupport -> speechd != null;
assert pulseSupport -> pulseaudio != null; assert pulseSupport -> libpulseaudio != null;
let let
optional = stdenv.lib.optional; optional = stdenv.lib.optional;
optionalString = stdenv.lib.optionalString; optionalString = stdenv.lib.optionalString;
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mumble-" + version; name = "mumble-${version}";
version = "1.2.8"; version = "1.2.8";
src = fetchurl { src = fetchurl {
@ -44,9 +44,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ avahi boost libopus libsndfile protobuf qt4 speex ] buildInputs = [ avahi boost libopus libsndfile protobuf qt4 speex ]
++ optional jackSupport jack2 ++ optional jackSupport libjack2
++ optional speechdSupport speechd ++ optional speechdSupport speechd
++ optional pulseSupport pulseaudio; ++ optional pulseSupport libpulseaudio;
installPhase = '' installPhase = ''
mkdir -p $out 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 , avahi, libcap, pkgconfig
, iceSupport ? false , iceSupport ? false
, zeroc_ice ? null , zeroc_ice ? null
@ -11,13 +11,9 @@ let
optionalString = stdenv.lib.optionalString; optionalString = stdenv.lib.optionalString;
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "murmur-" + version; name = "murmur-${version}";
version = "1.2.8";
src = fetchurl { inherit (mumble) version src;
url = "mirror://sourceforge/mumble/mumble-${version}.tar.gz";
sha256 = "0ng1xd7i0951kqnd9visf84y2dcwia79a1brjwfvr1wnykgw6bsc";
};
patchPhase = optional iceSupport '' patchPhase = optional iceSupport ''
sed -i 's,/usr/share/Ice/,${zeroc_ice}/,g' src/murmur/murmur.pro sed -i 's,/usr/share/Ice/,${zeroc_ice}/,g' src/murmur/murmur.pro