From af7a77aca6866b08dae12b1b43076a14865b59b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 12 Feb 2011 20:31:25 +0000 Subject: [PATCH] Mumble builds svn path=/nixpkgs/trunk/; revision=25927 --- pkgs/applications/networking/mumble/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 3b9673a294f..4befca2f606 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -1,8 +1,6 @@ { stdenv, fetchurl, qt4, libvorbis, boost, speechd, protobuf, libsndfile, - avahi }: + avahi, dbus, libcap }: -throw "It does not build still. It wants a g15daemon header file or so" - stdenv.mkDerivation rec { name = "mumble-" + version; version = "1.2.2"; @@ -17,9 +15,13 @@ stdenv.mkDerivation rec { sed -e /qt_ja_JP.qm/d -i src/mumble/mumble_qt.qrc src/mumble11x/mumble_qt.qrc ''; - configurePhase = "qmake PREFIX=$out"; + configurePhase = '' + qmake PREFIX=$out CONFIG+=no-g15 CONFIG+=no-update \ + CONFIG+=no-embed-qt-translations CONFIG+=no-ice + ''; - buildInputs = [ qt4 libvorbis boost speechd protobuf libsndfile avahi ]; + buildInputs = [ qt4 libvorbis boost speechd protobuf libsndfile avahi dbus + libcap ]; meta = { homepage = http://mumble.sourceforge.net/;