diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-04-17 02:38:29 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-20 18:55:46 +0300 |
| commit | 3c52b4253cd468be7af4291a7c2a051e90a49b83 (patch) | |
| tree | 30d85bbf5e28f3e89c69f5405c4af836130e188f /pkgs/applications/networking/mumble/default.nix | |
| parent | d52c326fd0554442372d501488d28be8c0c57d07 (diff) | |
| download | nixpkgs-3c52b4253cd468be7af4291a7c2a051e90a49b83.tar nixpkgs-3c52b4253cd468be7af4291a7c2a051e90a49b83.tar.gz nixpkgs-3c52b4253cd468be7af4291a7c2a051e90a49b83.tar.bz2 nixpkgs-3c52b4253cd468be7af4291a7c2a051e90a49b83.tar.lz nixpkgs-3c52b4253cd468be7af4291a7c2a051e90a49b83.tar.xz nixpkgs-3c52b4253cd468be7af4291a7c2a051e90a49b83.tar.zst nixpkgs-3c52b4253cd468be7af4291a7c2a051e90a49b83.zip | |
mumble: move to qmake{,4}Hook
Diffstat (limited to 'pkgs/applications/networking/mumble/default.nix')
| -rw-r--r-- | pkgs/applications/networking/mumble/default.nix | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 646e3dfdd0b..20a32159520 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchgit, pkgconfig -, qt4, qt5, avahi, boost, libopus, libsndfile, protobuf, speex, libcap +, qt4, qmake4Hook, qt5, avahi, boost, libopus, libsndfile, protobuf, speex, libcap , alsaLib , jackSupport ? false, libjack2 ? null , speechdSupport ? false, speechd ? null @@ -20,13 +20,13 @@ let patches = optional jackSupport ./mumble-jack-support.patch; nativeBuildInputs = [ pkgconfig ] - ++ { qt4 = [ qt4 ]; qt5 = [ qt5.qtbase ]; }."qt${toString source.qtVersion}" + ++ { qt4 = [ qmake4Hook ]; qt5 = [ qt5.qmakeHook ]; }."qt${toString source.qtVersion}" ++ (overrides.nativeBuildInputs or [ ]); buildInputs = [ boost protobuf avahi ] ++ { qt4 = [ qt4 ]; qt5 = [ qt5.qtbase ]; }."qt${toString source.qtVersion}" ++ (overrides.buildInputs or [ ]); - configureFlags = [ + qmakeFlags = [ "CONFIG+=shared" "CONFIG+=no-g15" "CONFIG+=packaged" @@ -39,10 +39,8 @@ let ++ optional jackSupport "CONFIG+=no-oss CONFIG+=no-alsa CONFIG+=jackaudio" ++ (overrides.configureFlags or [ ]); - configurePhase = '' - runHook preConfigure - qmake $configureFlags DEFINES+="PLUGIN_PATH=$out/lib" - runHook postConfigure + preConfigure = '' + qmakeFlags="$qmakeFlags DEFINES+=PLUGIN_PATH=$out/lib" ''; makeFlags = [ "release" ]; |