Merge pull request #151104 from veprbl/pr/qtgamepad_darwin

qt5.qtgamepad: add darwin support
This commit is contained in:
Dmitry Kalinkin 2021-12-21 15:57:34 -05:00 committed by GitHub
commit 1b1b768222
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 4 deletions

View file

@ -162,7 +162,9 @@ let
qtconnectivity = callPackage ../modules/qtconnectivity.nix {}; qtconnectivity = callPackage ../modules/qtconnectivity.nix {};
qtdeclarative = callPackage ../modules/qtdeclarative.nix {}; qtdeclarative = callPackage ../modules/qtdeclarative.nix {};
qtdoc = callPackage ../modules/qtdoc.nix {}; qtdoc = callPackage ../modules/qtdoc.nix {};
qtgamepad = callPackage ../modules/qtgamepad.nix {}; qtgamepad = callPackage ../modules/qtgamepad.nix {
inherit (darwin.apple_sdk.frameworks) GameController;
};
qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {}; qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {};
qtimageformats = callPackage ../modules/qtimageformats.nix {}; qtimageformats = callPackage ../modules/qtimageformats.nix {};
qtlocation = callPackage ../modules/qtlocation.nix {}; qtlocation = callPackage ../modules/qtlocation.nix {};

View file

@ -163,6 +163,9 @@ let
qtconnectivity = callPackage ../modules/qtconnectivity.nix {}; qtconnectivity = callPackage ../modules/qtconnectivity.nix {};
qtdeclarative = callPackage ../modules/qtdeclarative.nix {}; qtdeclarative = callPackage ../modules/qtdeclarative.nix {};
qtdoc = callPackage ../modules/qtdoc.nix {}; qtdoc = callPackage ../modules/qtdoc.nix {};
qtgamepad = callPackage ../modules/qtgamepad.nix {
inherit (darwin.apple_sdk.frameworks) GameController;
};
qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {}; qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {};
qtimageformats = callPackage ../modules/qtimageformats.nix {}; qtimageformats = callPackage ../modules/qtimageformats.nix {};
qtlocation = callPackage ../modules/qtlocation.nix {}; qtlocation = callPackage ../modules/qtlocation.nix {};

View file

@ -125,7 +125,9 @@ let
qtconnectivity = callPackage ../modules/qtconnectivity.nix {}; qtconnectivity = callPackage ../modules/qtconnectivity.nix {};
qtdeclarative = callPackage ../modules/qtdeclarative.nix {}; qtdeclarative = callPackage ../modules/qtdeclarative.nix {};
qtdoc = callPackage ../modules/qtdoc.nix {}; qtdoc = callPackage ../modules/qtdoc.nix {};
qtgamepad = callPackage ../modules/qtgamepad.nix {}; qtgamepad = callPackage ../modules/qtgamepad.nix {
inherit (darwin.apple_sdk.frameworks) GameController;
};
qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {}; qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {};
qtimageformats = callPackage ../modules/qtimageformats.nix {}; qtimageformats = callPackage ../modules/qtimageformats.nix {};
qtlocation = callPackage ../modules/qtlocation.nix {}; qtlocation = callPackage ../modules/qtlocation.nix {};

View file

@ -1,8 +1,9 @@
{ qtModule, qtbase, qtdeclarative, pkg-config }: { lib, stdenv, qtModule, qtbase, qtdeclarative, GameController, pkg-config }:
qtModule { qtModule {
pname = "qtgamepad"; pname = "qtgamepad";
qtInputs = [ qtbase qtdeclarative ]; qtInputs = [ qtbase qtdeclarative ]
++ lib.optional stdenv.isDarwin GameController;
buildInputs = [ ]; buildInputs = [ ];
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
outputs = [ "out" "dev" "bin" ]; outputs = [ "out" "dev" "bin" ];