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

Merge pull request #55910 from veprbl/pr/qt5_qtconnectivity_darwin_fix 

qt5.qtconnectivity: fix darwin build
This commit is contained in:
Matthew Bauer 2019-02-19 22:37:15 -05:00 committed by GitHub
parent a547a9b554 4bf4484515
commit 8724819d94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/qt-5/5.11/default.nix
View File

@ -94,7 +94,9 @@ let
}; };
qtcharts = callPackage ../modules/qtcharts.nix {}; qtcharts = callPackage ../modules/qtcharts.nix {};
qtconnectivity = callPackage ../modules/qtconnectivity.nix {}; qtconnectivity = callPackage ../modules/qtconnectivity.nix {
inherit cf-private;
};
qtdeclarative = callPackage ../modules/qtdeclarative.nix {}; qtdeclarative = callPackage ../modules/qtdeclarative.nix {};
qtdoc = callPackage ../modules/qtdoc.nix {}; qtdoc = callPackage ../modules/qtdoc.nix {};
qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {}; qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {};

4
pkgs/development/libraries/qt-5/5.12/default.nix
View File

@ -90,7 +90,9 @@ let
}; };
qtcharts = callPackage ../modules/qtcharts.nix {}; qtcharts = callPackage ../modules/qtcharts.nix {};
qtconnectivity = callPackage ../modules/qtconnectivity.nix {}; qtconnectivity = callPackage ../modules/qtconnectivity.nix {
inherit cf-private;
};
qtdeclarative = callPackage ../modules/qtdeclarative.nix {}; qtdeclarative = callPackage ../modules/qtdeclarative.nix {};
qtdoc = callPackage ../modules/qtdoc.nix {}; qtdoc = callPackage ../modules/qtdoc.nix {};
qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {}; qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {};

5
pkgs/development/libraries/qt-5/5.6/default.nix
View File

@ -29,6 +29,7 @@ existing packages here and modify it as necessary.
stdenv, fetchurl, fetchpatch, makeSetupHook, stdenv, fetchurl, fetchpatch, makeSetupHook,
bison, cups ? null, harfbuzz, libGL, perl, bison, cups ? null, harfbuzz, libGL, perl,
gstreamer, gst-plugins-base, gstreamer, gst-plugins-base,
cf-private,
# options # options
developerBuild ? false, developerBuild ? false,
@ -132,7 +133,9 @@ let
/* qtactiveqt = not packaged */ /* qtactiveqt = not packaged */
/* qtandroidextras = not packaged */ /* qtandroidextras = not packaged */
/* qtcanvas3d = not packaged */ /* qtcanvas3d = not packaged */
qtconnectivity = callPackage ../modules/qtconnectivity.nix {}; qtconnectivity = callPackage ../modules/qtconnectivity.nix {
inherit cf-private;
};
qtdeclarative = callPackage ../modules/qtdeclarative.nix {}; qtdeclarative = callPackage ../modules/qtdeclarative.nix {};
qtdoc = callPackage ../modules/qtdoc.nix {}; qtdoc = callPackage ../modules/qtdoc.nix {};
qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {}; qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {};

4
pkgs/development/libraries/qt-5/5.9/default.nix
View File

@ -92,7 +92,9 @@ let
}; };
qtcharts = callPackage ../modules/qtcharts.nix {}; qtcharts = callPackage ../modules/qtcharts.nix {};
qtconnectivity = callPackage ../modules/qtconnectivity.nix {}; qtconnectivity = callPackage ../modules/qtconnectivity.nix {
inherit cf-private;
};
qtdeclarative = callPackage ../modules/qtdeclarative.nix {}; qtdeclarative = callPackage ../modules/qtdeclarative.nix {};
qtdoc = callPackage ../modules/qtdoc.nix {}; qtdoc = callPackage ../modules/qtdoc.nix {};
qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {}; qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {};

4
pkgs/development/libraries/qt-5/modules/qtconnectivity.nix
View File

@ -1,8 +1,8 @@
{ qtModule, qtbase, qtdeclarative, bluez }: { qtModule, stdenv, qtbase, qtdeclarative, bluez, cf-private }:
qtModule { qtModule {
name = "qtconnectivity"; name = "qtconnectivity";
qtInputs = [ qtbase qtdeclarative ]; qtInputs = [ qtbase qtdeclarative ];
buildInputs = [ bluez ]; buildInputs = if stdenv.isDarwin then [ cf-private ] else [ bluez ];
outputs = [ "out" "dev" "bin" ]; outputs = [ "out" "dev" "bin" ];
} }

1
pkgs/top-level/all-packages.nix
View File

@ -12148,6 +12148,7 @@ in
harfbuzz = harfbuzzFull; harfbuzz = harfbuzzFull;
inherit libGL; inherit libGL;
inherit perl; inherit perl;
inherit (darwin) cf-private;
inherit (gst_all_1) gstreamer gst-plugins-base; inherit (gst_all_1) gstreamer gst-plugins-base;
}); });