diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-04-25 23:32:04 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-04-25 23:32:04 -0700 |
| commit | 03d755aca57245057e580982535761719d66ea2c (patch) | |
| tree | 17a4f042e2844d7040993a7c8cd31cc63fdf0a57 | |
| parent | 3cb1669249cac15bcb486f4241795f6b87811945 (diff) | |
| download | nixpkgs-03d755aca57245057e580982535761719d66ea2c.tar nixpkgs-03d755aca57245057e580982535761719d66ea2c.tar.gz nixpkgs-03d755aca57245057e580982535761719d66ea2c.tar.bz2 nixpkgs-03d755aca57245057e580982535761719d66ea2c.tar.lz nixpkgs-03d755aca57245057e580982535761719d66ea2c.tar.xz nixpkgs-03d755aca57245057e580982535761719d66ea2c.tar.zst nixpkgs-03d755aca57245057e580982535761719d66ea2c.zip | |
mumble: Refactor
| -rw-r--r-- | pkgs/applications/networking/mumble/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/applications/networking/mumble/murmur.nix | 10 |
2 files changed, 10 insertions, 14 deletions
diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 358a0bb1228..611d77eb215 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -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 diff --git a/pkgs/applications/networking/mumble/murmur.nix b/pkgs/applications/networking/mumble/murmur.nix index 1c06392f60b..cb10fca6cd9 100644 --- a/pkgs/applications/networking/mumble/murmur.nix +++ b/pkgs/applications/networking/mumble/murmur.nix @@ -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 |