movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-15 05:59:17 +03:00
Code Issues Projects Releases Packages 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
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; with lib;
let let
bluez-bluetooth = pkgs.bluez;
cfg = config.hardware.bluetooth; cfg = config.hardware.bluetooth;
bluez-bluetooth = cfg.package;
in { in {
@ -21,6 +21,16 @@ in {
description = "Whether to power up the default Bluetooth controller on boot."; 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 { extraConfig = mkOption {
type = types.lines; type = types.lines;
default = ""; default = "";

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

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, dbus, glib, alsaLib, { stdenv, fetchurl, pkgconfig, dbus, glib, alsaLib,
pythonPackages, readline, udev, libical, pythonPackages, readline, udev, libical,
systemd, enableWiimote ? false }: systemd, enableWiimote ? false, enableMidi ? false }:
assert stdenv.isLinux; assert stdenv.isLinux;
@ -40,8 +40,8 @@ stdenv.mkDerivation rec {
"--with-systemdsystemunitdir=$(out)/etc/systemd/system" "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
"--with-systemduserunitdir=$(out)/etc/systemd/user" "--with-systemduserunitdir=$(out)/etc/systemd/user"
"--with-udevdir=$(out)/lib/udev" "--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. # Work around `make install' trying to create /var/lib/bluetooth.
installFlags = "statedir=$(TMPDIR)/var/lib/bluetooth"; installFlags = "statedir=$(TMPDIR)/var/lib/bluetooth";