Unverified Commit c4ba2c64 authored by Alyssa Ross's avatar Alyssa Ross
Browse files

bluez: 5.76 -> 5.78 

Fixes building for musl with GCC 14.

Closes: https://github.com/NixOS/nixpkgs/pull/334891
parent 478bc3b4

pkgs/by-name/bl/bluez/package.nix

+10 −17
Original line number Diff line number Diff line
@@ -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
@@ -62,6 +54,7 @@ stdenv.mkDerivation (finalAttrs: { 
  nativeBuildInputs = [

    docutils

    pkg-config

    python3Packages.pygments

    python3Packages.wrapPython

  ];