public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mumble: move to qmake{,4}Hook

Browse Source
This commit is contained in:
Nikolay Amiantov 2016-04-17 02:38:29 +03:00
parent d52c326fd0
commit 3c52b4253c
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/networking/mumble/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchgit, pkgconfig { stdenv, fetchurl, fetchgit, pkgconfig
, qt4, qt5, avahi, boost, libopus, libsndfile, protobuf, speex, libcap , qt4, qmake4Hook, qt5, avahi, boost, libopus, libsndfile, protobuf, speex, libcap
, alsaLib , alsaLib
, jackSupport ? false, libjack2 ? null , jackSupport ? false, libjack2 ? null
, speechdSupport ? false, speechd ? null , speechdSupport ? false, speechd ? null
@ -20,13 +20,13 @@ let
patches = optional jackSupport ./mumble-jack-support.patch; patches = optional jackSupport ./mumble-jack-support.patch;
nativeBuildInputs = [ pkgconfig ] nativeBuildInputs = [ pkgconfig ]
++ { qt4 = [ qt4 ]; qt5 = [ qt5.qtbase ]; }."qt${toString source.qtVersion}" ++ { qt4 = [ qmake4Hook ]; qt5 = [ qt5.qmakeHook ]; }."qt${toString source.qtVersion}"
++ (overrides.nativeBuildInputs or [ ]); ++ (overrides.nativeBuildInputs or [ ]);
buildInputs = [ boost protobuf avahi ] buildInputs = [ boost protobuf avahi ]
++ { qt4 = [ qt4 ]; qt5 = [ qt5.qtbase ]; }."qt${toString source.qtVersion}" ++ { qt4 = [ qt4 ]; qt5 = [ qt5.qtbase ]; }."qt${toString source.qtVersion}"
++ (overrides.buildInputs or [ ]); ++ (overrides.buildInputs or [ ]);
configureFlags = [ qmakeFlags = [
"CONFIG+=shared" "CONFIG+=shared"
"CONFIG+=no-g15" "CONFIG+=no-g15"
"CONFIG+=packaged" "CONFIG+=packaged"
@ -39,10 +39,8 @@ let
++ optional jackSupport "CONFIG+=no-oss CONFIG+=no-alsa CONFIG+=jackaudio" ++ optional jackSupport "CONFIG+=no-oss CONFIG+=no-alsa CONFIG+=jackaudio"
++ (overrides.configureFlags or [ ]); ++ (overrides.configureFlags or [ ]);
configurePhase = '' preConfigure = ''
runHook preConfigure qmakeFlags="$qmakeFlags DEFINES+=PLUGIN_PATH=$out/lib"
qmake $configureFlags DEFINES+="PLUGIN_PATH=$out/lib"
runHook postConfigure
''; '';
makeFlags = [ "release" ]; makeFlags = [ "release" ];