Unverified Commit 896cb0b3 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #226067 from wegank/qt6-qtconnectivity-fix 

qt6.qtconnectivity: fix build on darwin
parents d38bfca7 1bf4cbfa

pkgs/development/libraries/qt-6/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ let 
      qt5compat = callPackage ./modules/qt5compat.nix { };

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

      qtconnectivity = callPackage ./modules/qtconnectivity.nix {

        inherit (darwin.apple_sdk_11_0.frameworks) PCSC;

        inherit (darwin.apple_sdk_11_0.frameworks) IOBluetooth PCSC;

      };

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

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

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

+2 −1
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
, qtdeclarative

, bluez

, pkg-config

, IOBluetooth

, PCSC

}:
@@ -13,5 +14,5 @@ qtModule { 
  qtInputs = [ qtbase qtdeclarative ];

  nativeBuildInputs = [ pkg-config ];

  buildInputs = lib.optionals stdenv.isLinux [ bluez ];

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

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

}