b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source 
qt6.qtconnectivity: fix build on darwin
This commit is contained in:
Weijia Wang 2023-04-14 00:30:30 +03:00 committed by GitHub
parent d38bfca778 1bf4cbfa5e
commit 896cb0b3a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/libraries/qt-6/default.nix
View file

@ -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 { };

3
pkgs/development/libraries/qt-6/modules/qtconnectivity.nix
View file

@ -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 ];
}