Unverified Commit ae51a986 authored by Fabián Heredia Montiel's avatar Fabián Heredia Montiel Committed by GitHub
Browse files

bluez: 5.76 -> 5.78 (#341994)

parents a6d156bb c4ba2c64
Loading
Loading
Loading
Loading
+14 −21
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@
, json_c
, libical
, pkg-config
, python3
, python3Packages
, readline
, systemdMinimal
, udev
@@ -24,28 +24,20 @@

stdenv.mkDerivation (finalAttrs: {
  pname = "bluez";
  version = "5.76";
  version = "5.78";

  src = fetchurl {
    url = "mirror://kernel/linux/bluetooth/bluez-${finalAttrs.version}.tar.xz";
    hash = "sha256-VeLGRZCa2C2DPELOhewgQ04O8AcJQbHqtz+s3SQLvWM=";
    hash = "sha256-gw/tGRXF03W43g9eb0X83qDcxf9f+z0x227Q8A1zxeM=";
  };

  patches = [
    # hog-lib: Fix passing wrong parameters to bt_uhid_get_report_reply
    (fetchpatch {
      url = "https://github.com/bluez/bluez/commit/5ebaeab4164f80539904b9a520d9b7a8307e06e2.patch";
      hash = "sha256-f1A8DmRPfm+zid4XMj1zsfcLZ0WTEax3YPbydKZF9RE=";
    })
  ]
  # Disable one failing test with musl libc, also seen by alpine
  # https://github.com/bluez/bluez/issues/726
    ++ lib.optional (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isx86_64)
  patches = lib.optional (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isx86_64)
    (fetchurl {
      url = "https://git.alpinelinux.org/aports/plain/main/bluez/disable_aics_unit_testcases.patch?id=8e96f7faf01a45f0ad8449c1cd825db63a8dfd48";
      hash = "sha256-1PJkipqBO3qxxOqRFQKfpWlne1kzTCgtnTFYI1cFQt4=";
      })
  ;
    });

  buildInputs = [
    alsa-lib
@@ -54,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
    glib
    json_c
    libical
    python3
    python3Packages.python
    readline
    udev
  ];
@@ -62,7 +54,8 @@ stdenv.mkDerivation (finalAttrs: {
  nativeBuildInputs = [
    docutils
    pkg-config
    python3.pkgs.wrapPython
    python3Packages.pygments
    python3Packages.wrapPython
  ];

  outputs = [ "out" "dev" ]
@@ -122,7 +115,7 @@ stdenv.mkDerivation (finalAttrs: {
  doCheck = stdenv.hostPlatform.isx86_64;

  postInstall = let
    pythonPath = with python3.pkgs; [
    pythonPath = with python3Packages; [
      dbus-python
      pygobject3
    ];