diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-11 18:01:59 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-11 18:01:59 +0000 |
| commit | babb761ac622c87ca51dbcede7668c73ba1217df (patch) | |
| tree | e4d7a2427cf93c204bbe9c15005c02eeb0274b27 /pkgs/os-specific/linux | |
| parent | c2ba734993427e26af8489eb3d4363b6838b6eb2 (diff) | |
| parent | 56ebfce4ee36b160f36c84f6dc69b32ce50a0594 (diff) | |
| download | nixpkgs-babb761ac622c87ca51dbcede7668c73ba1217df.tar nixpkgs-babb761ac622c87ca51dbcede7668c73ba1217df.tar.gz nixpkgs-babb761ac622c87ca51dbcede7668c73ba1217df.tar.bz2 nixpkgs-babb761ac622c87ca51dbcede7668c73ba1217df.tar.lz nixpkgs-babb761ac622c87ca51dbcede7668c73ba1217df.tar.xz nixpkgs-babb761ac622c87ca51dbcede7668c73ba1217df.tar.zst nixpkgs-babb761ac622c87ca51dbcede7668c73ba1217df.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/bluez/default.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index 6af83e4cf64..040b8fc8478 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -3,9 +3,11 @@ , fetchurl , alsa-lib , dbus +, ell , glib , json_c , libical +, docutils , pkg-config , python3 , readline @@ -19,16 +21,17 @@ ]; in stdenv.mkDerivation rec { pname = "bluez"; - version = "5.58"; + version = "5.60"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/${pname}-${version}.tar.xz"; - sha256 = "1wgiv8cqya6n1w5fz24cb8q401bhn5aa6s7g95l26rzblmsmw1n8"; + sha256 = "sha256-cQmZWA0B7lnsWF5efAf9lO3e3AAaom/nRkxUb52UUwQ="; }; buildInputs = [ alsa-lib dbus + ell glib json_c libical @@ -38,6 +41,7 @@ in stdenv.mkDerivation rec { ]; nativeBuildInputs = [ + docutils pkg-config python3.pkgs.wrapPython ]; @@ -60,6 +64,7 @@ in stdenv.mkDerivation rec { "--enable-library" "--enable-cups" "--enable-pie" + "--enable-external-ell" "--with-dbusconfdir=${placeholder "out"}/share" "--with-dbussystembusdir=${placeholder "out"}/share/dbus-1/system-services" "--with-dbussessionbusdir=${placeholder "out"}/share/dbus-1/services" @@ -72,7 +77,6 @@ in stdenv.mkDerivation rec { "--enable-nfc" "--enable-sap" "--enable-sixaxis" - "--enable-wiimote" ]; # Work around `make install' trying to create /var/lib/bluetooth. |