diff options
author | André-Patrick Bubel <code@andre-bubel.de> | 2019-12-08 20:53:49 +0100 |
---|---|---|
committer | André-Patrick Bubel <code@andre-bubel.de> | 2019-12-08 20:53:49 +0100 |
commit | 83655d69937f6d1b62e8cc791cea27026bd21249 (patch) | |
tree | 7b8bf17922fe189d5fb5f736821ff4337b70a05a /pkgs/os-specific/linux/bluez/default.nix | |
parent | 19f42620ef9158262d2e67948aa38165825a04b8 (diff) | |
download | nixpkgs-83655d69937f6d1b62e8cc791cea27026bd21249.tar nixpkgs-83655d69937f6d1b62e8cc791cea27026bd21249.tar.gz nixpkgs-83655d69937f6d1b62e8cc791cea27026bd21249.tar.bz2 nixpkgs-83655d69937f6d1b62e8cc791cea27026bd21249.tar.lz nixpkgs-83655d69937f6d1b62e8cc791cea27026bd21249.tar.xz nixpkgs-83655d69937f6d1b62e8cc791cea27026bd21249.tar.zst nixpkgs-83655d69937f6d1b62e8cc791cea27026bd21249.zip |
bluez: 5.51 -> 5.52, aliased bluezFull to bluez
Diffstat (limited to 'pkgs/os-specific/linux/bluez/default.nix')
-rw-r--r-- | pkgs/os-specific/linux/bluez/default.nix | 75 |
1 files changed, 45 insertions, 30 deletions
diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index bc33ddd4c9b..8024adeac64 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -1,43 +1,58 @@ -{ stdenv, lib, fetchurl, pkgconfig, dbus, glib, alsaLib, - python3, readline, udev, libical, systemd, json_c, - enableHealth ? false, - enableMesh ? false, - enableMidi ? false, - enableNfc ? false, - enableSap ? false, - enableSixaxis ? false, - enableWiimote ? false, +{ stdenv +, lib +, fetchurl +, alsaLib +, dbus +, glib +, json_c +, libical +, pkgconfig +, python3 +, readline +, systemd +, udev }: stdenv.mkDerivation rec { - version = "5.51"; - name = "bluez-${version}"; + pname = "bluez"; + version = "5.52"; src = fetchurl { - url = "mirror://kernel/linux/bluetooth/${name}.tar.xz"; - sha256 = "1fpbsl9kkfq6mn6n0dg4h0il4c7fzhwhn79gh907k5b2kwszpvgb"; + url = "mirror://kernel/linux/bluetooth/${pname}-${version}.tar.xz"; + sha256 = "02jng21lp6fb3c2bh6vf9y7cj4gaxwk29dfc32ncy0lj0gi4q57p"; }; pythonPath = with python3.pkgs; [ - dbus-python pygobject2 pygobject3 recursivePthLoader + dbus-python + pygobject3 + recursivePthLoader ]; buildInputs = [ - dbus glib alsaLib python3 python3.pkgs.wrapPython - readline udev libical - ] ++ lib.optional enableSap json_c; + alsaLib + dbus + glib + json_c + libical + python3 + readline + udev + ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ + pkgconfig + python3.pkgs.wrapPython + ]; outputs = [ "out" "dev" "test" ]; - postConfigure = '' + postPatch = '' substituteInPlace tools/hid2hci.rules \ --replace /sbin/udevadm ${systemd}/bin/udevadm \ --replace "hid2hci " "$out/lib/udev/hid2hci " ''; - configureFlags = (with stdenv.lib; [ + configureFlags = [ "--localstatedir=/var" "--enable-library" "--enable-cups" @@ -48,19 +63,19 @@ stdenv.mkDerivation rec { "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system" "--with-systemduserunitdir=${placeholder "out"}/etc/systemd/user" "--with-udevdir=${placeholder "out"}/lib/udev" - ] ++ optional enableHealth [ "--enable-health" ] - ++ optional enableMesh [ "--enable-mesh" ] - ++ optional enableMidi [ "--enable-midi" ] - ++ optional enableNfc [ "--enable-nfc" ] - ++ optional enableSap [ "--enable-sap" ] - ++ optional enableSixaxis [ "--enable-sixaxis" ] - ++ optional enableWiimote [ "--enable-wiimote" ] - ); + "--enable-health" + "--enable-mesh" + "--enable-midi" + "--enable-nfc" + "--enable-sap" + "--enable-sixaxis" + "--enable-wiimote" + ]; # Work around `make install' trying to create /var/lib/bluetooth. - installFlags = "statedir=$(TMPDIR)/var/lib/bluetooth"; + installFlags = [ "statedir=$(TMPDIR)/var/lib/bluetooth" ]; - makeFlags = "rulesdir=${placeholder "out"}/lib/udev/rules.d"; + makeFlags = [ "rulesdir=${placeholder "out"}/lib/udev/rules.d" ]; postInstall = '' mkdir -p $test/{bin,test} |