diff options
| author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2021-07-10 21:43:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-10 21:43:42 +0200 |
| commit | 9488ed968585ad1085cda5db66698ba0246c41b8 (patch) | |
| tree | 344ef74187be1f7a8f1c75a4a3c4d1267a539acd /pkgs/os-specific | |
| parent | 5ec8029d370d5c874961baf7d8fbf5eb8f01298b (diff) | |
| parent | fc4436dc43d080da47858da2f162e6e7e083c7c1 (diff) | |
| download | nixpkgs-9488ed968585ad1085cda5db66698ba0246c41b8.tar nixpkgs-9488ed968585ad1085cda5db66698ba0246c41b8.tar.gz nixpkgs-9488ed968585ad1085cda5db66698ba0246c41b8.tar.bz2 nixpkgs-9488ed968585ad1085cda5db66698ba0246c41b8.tar.lz nixpkgs-9488ed968585ad1085cda5db66698ba0246c41b8.tar.xz nixpkgs-9488ed968585ad1085cda5db66698ba0246c41b8.tar.zst nixpkgs-9488ed968585ad1085cda5db66698ba0246c41b8.zip | |
Merge pull request #127183 from mweinelt/bluez
Diffstat (limited to 'pkgs/os-specific')
| -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 f995c8c5c1e..b9701cd28c5 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.59"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/${pname}-${version}.tar.xz"; - sha256 = "1wgiv8cqya6n1w5fz24cb8q401bhn5aa6s7g95l26rzblmsmw1n8"; + sha256 = "05kk8zdh3msf5j88jbai8m877rvya6fpkzhicfhv5gyhhsrrasq4"; }; buildInputs = [ alsa-lib dbus + ell glib json_c libical @@ -38,6 +41,7 @@ in stdenv.mkDerivation rec { ]; nativeBuildInputs = [ + docutils pkg-config python3.pkgs.wrapPython ]; @@ -55,6 +59,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" @@ -67,7 +72,6 @@ in stdenv.mkDerivation rec { "--enable-nfc" "--enable-sap" "--enable-sixaxis" - "--enable-wiimote" ]; # Work around `make install' trying to create /var/lib/bluetooth. |