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

mumble/murmur: Fix .override not working

Browse Source 
Unfortunately there's no pkgs.libsForQt5.callPackages, which we need here to
get .override attributes on all derivation attributes. It's also
non-trivial to add it without duplicating code.

So instead just use standard pkgs.callPackages and pass refer to qt libs
through pkgs.qt5
This commit is contained in:
Silvan Mosberger 2019-10-08 01:44:48 +02:00
parent b81de296fb
commit 27605cebae
No known key found for this signature in database
GPG Key ID: 9424360B4B85C9E7
2 changed files with 8 additions and 8 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, fetchFromGitHub, fetchpatch, pkgconfig, mkDerivation
, qtbase, qttools, qtsvg, qmake, avahi, boost, libopus, libsndfile, protobuf, speex, libcap
{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, pkgconfig, qt5
, avahi, boost, libopus, libsndfile, protobuf, speex, libcap
, alsaLib, python
, jackSupport ? false, libjack2 ? null
, speechdSupport ? false, speechd ? null
@ -14,12 +14,12 @@ assert iceSupport -> zeroc-ice != null;
with stdenv.lib;
let
generic = overrides: source: mkDerivation (source // overrides // {
generic = overrides: source: qt5.mkDerivation (source // overrides // {
name = "${overrides.type}-${source.version}";
patches = (source.patches or []) ++ optional jackSupport ./mumble-jack-support.patch;
nativeBuildInputs = [ pkgconfig python qmake ]
nativeBuildInputs = [ pkgconfig python qt5.qmake ]
++ (overrides.nativeBuildInputs or [ ]);
buildInputs = [ boost protobuf avahi ]
@ -72,8 +72,8 @@ let
client = source: generic {
type = "mumble";
nativeBuildInputs = [ qttools ];
buildInputs = [ libopus libsndfile speex qtsvg ]
nativeBuildInputs = [ qt5.qttools ];
buildInputs = [ libopus libsndfile speex qt5.qtsvg ]
++ optional stdenv.isLinux alsaLib
++ optional jackSupport libjack2
++ optional speechdSupport speechd

4
pkgs/top-level/all-packages.nix
View File

@ -19672,13 +19672,13 @@ in
multimon-ng = callPackage ../applications/radio/multimon-ng { };
murmur = (libsForQt5.callPackage ../applications/networking/mumble {
murmur = (callPackages ../applications/networking/mumble {
avahi = avahi-compat;
pulseSupport = config.pulseaudio or false;
iceSupport = config.murmur.iceSupport or true;
}).murmur;
mumble = (libsForQt5.callPackage ../applications/networking/mumble {
mumble = (callPackages ../applications/networking/mumble {
avahi = avahi-compat;
jackSupport = config.mumble.jackSupport or false;
speechdSupport = config.mumble.speechdSupport or false;