public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests 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
parent d208fa53eb 942d90b282
commit 6adc522db4
4 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/qt-5/5.11/default.nix
+4 -1
View File
@@ -20,6 +20,7 @@ top-level attribute to `top-level/all-packages.nix`.
stdenv, fetchurl, fetchFromGitHub, makeSetupHook, stdenv, fetchurl, fetchFromGitHub, makeSetupHook,
bison, cups ? null, harfbuzz, libGL, perl, bison, cups ? null, harfbuzz, libGL, perl,
gstreamer, gst-plugins-base, gtk3, dconf, gstreamer, gst-plugins-base, gtk3, dconf,
cf-private,
# options # options
developerBuild ? false, developerBuild ? false,
@@ -95,7 +96,9 @@ let
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 {};
qtmacextras = callPackage ../modules/qtmacextras.nix {}; qtmacextras = callPackage ../modules/qtmacextras.nix {
inherit cf-private;
};
qtmultimedia = callPackage ../modules/qtmultimedia.nix { qtmultimedia = callPackage ../modules/qtmultimedia.nix {
inherit gstreamer gst-plugins-base; inherit gstreamer gst-plugins-base;
}; };
pkgs/development/libraries/qt-5/5.9/default.nix
+4 -1
View File
@@ -20,6 +20,7 @@ top-level attribute to `top-level/all-packages.nix`.
stdenv, fetchurl, makeSetupHook, stdenv, fetchurl, makeSetupHook,
bison, cups ? null, harfbuzz, libGL, perl, bison, cups ? null, harfbuzz, libGL, perl,
gstreamer, gst-plugins-base, gtk3, dconf, gstreamer, gst-plugins-base, gtk3, dconf,
cf-private,
# options # options
developerBuild ? false, developerBuild ? false,
@@ -78,7 +79,9 @@ let
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 {};
qtmacextras = callPackage ../modules/qtmacextras.nix {}; qtmacextras = callPackage ../modules/qtmacextras.nix {
inherit cf-private;
};
qtmultimedia = callPackage ../modules/qtmultimedia.nix { qtmultimedia = callPackage ../modules/qtmultimedia.nix {
inherit gstreamer gst-plugins-base; inherit gstreamer gst-plugins-base;
}; };
pkgs/development/libraries/qt-5/modules/qtmacextras.nix
+5 -3
View File
@@ -1,9 +1,11 @@
{ qtModule, qtbase, lib }: { stdenv, qtModule, qtbase, cf-private }:
qtModule { qtModule {
name = "qtmacextras"; name = "qtmacextras";
qtInputs = [ qtbase ]; qtInputs = [ qtbase ]
meta = with lib; { # Needed for _OBJC_CLASS_$_NSData symbols.
++ stdenv.lib.optional stdenv.isDarwin cf-private;
meta = with stdenv.lib; {
maintainers = with maintainers; [ periklis ]; maintainers = with maintainers; [ periklis ];
platforms = platforms.darwin; platforms = platforms.darwin;
}; };
pkgs/top-level/all-packages.nix
+3 -1
View File
@@ -11947,6 +11947,7 @@ with pkgs;
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;
inherit (gnome3) gtk3 dconf; inherit (gnome3) gtk3 dconf;
}); });
@@ -11962,8 +11963,9 @@ with pkgs;
harfbuzz = harfbuzzFull; harfbuzz = harfbuzzFull;
inherit libGL; inherit libGL;
inherit perl; inherit perl;
inherit (gst_all_1) gstreamer gst-plugins-base; inherit (darwin) cf-private;
inherit (gnome3) gtk3 dconf; inherit (gnome3) gtk3 dconf;
inherit (gst_all_1) gstreamer gst-plugins-base;
}); });
libsForQt511 = recurseIntoAttrs (lib.makeScope qt511.newScope mkLibsForQt5); libsForQt511 = recurseIntoAttrs (lib.makeScope qt511.newScope mkLibsForQt5);