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

Merge pull request #50524 from LnL7/darwin-qtmacextras

Browse Source 
qt5.qtmacextras: include cf-private on darwin
This commit is contained in:
Daiderd Jordan 2018-11-18 11:38:07 +01:00 committed by GitHub
commit 6adc522db4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,6 +20,7 @@ top-level attribute to `top-level/all-packages.nix`.
stdenv, fetchurl, fetchFromGitHub, makeSetupHook,
bison, cups ? null, harfbuzz, libGL, perl,
gstreamer, gst-plugins-base, gtk3, dconf,
cf-private,
# options
developerBuild ? false,
@ -95,7 +96,9 @@ let
qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {};
qtimageformats = callPackage ../modules/qtimageformats.nix {};
qtlocation = callPackage ../modules/qtlocation.nix {};
qtmacextras = callPackage ../modules/qtmacextras.nix {};
qtmacextras = callPackage ../modules/qtmacextras.nix {
inherit cf-private;
};
qtmultimedia = callPackage ../modules/qtmultimedia.nix {
inherit gstreamer gst-plugins-base;
};

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

@ -20,6 +20,7 @@ top-level attribute to `top-level/all-packages.nix`.
stdenv, fetchurl, makeSetupHook,
bison, cups ? null, harfbuzz, libGL, perl,
gstreamer, gst-plugins-base, gtk3, dconf,
cf-private,
# options
developerBuild ? false,
@ -78,7 +79,9 @@ let
qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {};
qtimageformats = callPackage ../modules/qtimageformats.nix {};
qtlocation = callPackage ../modules/qtlocation.nix {};
qtmacextras = callPackage ../modules/qtmacextras.nix {};
qtmacextras = callPackage ../modules/qtmacextras.nix {
inherit cf-private;
};
qtmultimedia = callPackage ../modules/qtmultimedia.nix {
inherit gstreamer gst-plugins-base;
};

8
pkgs/development/libraries/qt-5/modules/qtmacextras.nix
View File

@ -1,9 +1,11 @@
{ qtModule, qtbase, lib }:
{ stdenv, qtModule, qtbase, cf-private }:
qtModule {
name = "qtmacextras";
qtInputs = [ qtbase ];
meta = with lib; {
qtInputs = [ qtbase ]
# Needed for _OBJC_CLASS_$_NSData symbols.
++ stdenv.lib.optional stdenv.isDarwin cf-private;
meta = with stdenv.lib; {
maintainers = with maintainers; [ periklis ];
platforms = platforms.darwin;
};

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

@ -11947,6 +11947,7 @@ with pkgs;
harfbuzz = harfbuzzFull;
inherit libGL;
inherit perl;
inherit (darwin) cf-private;
inherit (gst_all_1) gstreamer gst-plugins-base;
inherit (gnome3) gtk3 dconf;
});
@ -11962,8 +11963,9 @@ with pkgs;
harfbuzz = harfbuzzFull;
inherit libGL;
inherit perl;
inherit (gst_all_1) gstreamer gst-plugins-base;
inherit (darwin) cf-private;
inherit (gnome3) gtk3 dconf;
inherit (gst_all_1) gstreamer gst-plugins-base;
});
libsForQt511 = recurseIntoAttrs (lib.makeScope qt511.newScope mkLibsForQt5);