gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
libsForQt5.qtconnectivity: fix build on darwin
This commit is contained in:
Weijia Wang
2023-05-09 08:42:41 +03:00
committed by GitHub
parent e138708d30 09aba852bf
commit 2c72c3e448
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/qt-5/5.15/default.nix
+3 -1
View File
@@ -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
View File
@@ -1,8 +1,9 @@
{ 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" ];
}