Unverified Commit 2c72c3e4 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #230749 from wegank/qt5-qtconnectivity-darwin 

libsForQt5.qtconnectivity: fix build on darwin
parents e138708d 09aba852

pkgs/development/libraries/qt-5/5.15/default.nix

+3 −1
Original line number Diff line number Diff line
@@ -149,7 +149,9 @@ let 


      qt3d = callPackage ../modules/qt3d.nix {};

      qtcharts = callPackage ../modules/qtcharts.nix {};

      qtconnectivity = callPackage ../modules/qtconnectivity.nix {};

      qtconnectivity = callPackage ../modules/qtconnectivity.nix {

        inherit (darwin.apple_sdk_11_0.frameworks) IOBluetooth;

      };

      qtdatavis3d = callPackage ../modules/qtdatavis3d.nix {};

      qtdeclarative = callPackage ../modules/qtdeclarative.nix {};

      qtdoc = callPackage ../modules/qtdoc.nix {};

pkgs/development/libraries/qt-5/modules/qtconnectivity.nix

+2 −1
Original line number Diff line number Diff line 
{ qtModule, lib, stdenv, qtbase, qtdeclarative, bluez }:

{ qtModule, lib, stdenv, qtbase, qtdeclarative, bluez, IOBluetooth }:



qtModule {

  pname = "qtconnectivity";

  qtInputs = [ qtbase qtdeclarative ];

  buildInputs = lib.optional stdenv.isLinux bluez;

  propagatedBuildInputs = lib.optionals stdenv.isDarwin [ IOBluetooth ];

  outputs = [ "out" "dev" "bin" ];

}