mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-09-11 15:08:33 +01:00
Merge pull request #36406 from alesguzik/bluez-midi
Bluetooth MIDI support
This commit is contained in:
commit
8691bb57d3
|
@ -3,8 +3,8 @@
|
|||
with lib;
|
||||
|
||||
let
|
||||
bluez-bluetooth = pkgs.bluez;
|
||||
cfg = config.hardware.bluetooth;
|
||||
bluez-bluetooth = cfg.package;
|
||||
|
||||
in {
|
||||
|
||||
|
@ -21,6 +21,16 @@ in {
|
|||
description = "Whether to power up the default Bluetooth controller on boot.";
|
||||
};
|
||||
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.bluez;
|
||||
defaultText = "pkgs.bluez";
|
||||
example = "pkgs.bluez.override { enableMidi = true; }";
|
||||
description = ''
|
||||
Which BlueZ package to use.
|
||||
'';
|
||||
};
|
||||
|
||||
extraConfig = mkOption {
|
||||
type = types.lines;
|
||||
default = "";
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{ stdenv, fetchurl, pkgconfig, dbus, glib, alsaLib,
|
||||
pythonPackages, readline, udev, libical,
|
||||
systemd, enableWiimote ? false }:
|
||||
systemd, enableWiimote ? false, enableMidi ? false }:
|
||||
|
||||
assert stdenv.isLinux;
|
||||
|
||||
|
@ -40,8 +40,8 @@ stdenv.mkDerivation rec {
|
|||
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
|
||||
"--with-systemduserunitdir=$(out)/etc/systemd/user"
|
||||
"--with-udevdir=$(out)/lib/udev"
|
||||
] ++
|
||||
stdenv.lib.optional enableWiimote [ "--enable-wiimote" ];
|
||||
] ++ stdenv.lib.optional enableWiimote [ "--enable-wiimote" ]
|
||||
++ stdenv.lib.optional enableMidi [ "--enable-midi" ];
|
||||
|
||||
# Work around `make install' trying to create /var/lib/bluetooth.
|
||||
installFlags = "statedir=$(TMPDIR)/var/lib/bluetooth";
|
||||
|
|
Loading…
Reference in a new issue