ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-22 13:08:39 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #36406 from alesguzik/bluez-midi

Browse Source 
Bluetooth MIDI support
This commit is contained in:
Matthew Justin Bauer 2018-04-17 10:54:23 -05:00 committed by GitHub
commit 8691bb57d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nixos/modules/services/hardware/bluetooth.nix
View File

@ -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 = "";

6
pkgs/os-specific/linux/bluez/default.nix
View File

@ -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";