diff --git a/pkgs/development/libraries/qt-5/5.11/default.nix b/pkgs/development/libraries/qt-5/5.11/default.nix index 57300878e49..65a1d0b9bef 100644 --- a/pkgs/development/libraries/qt-5/5.11/default.nix +++ b/pkgs/development/libraries/qt-5/5.11/default.nix @@ -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; }; diff --git a/pkgs/development/libraries/qt-5/5.9/default.nix b/pkgs/development/libraries/qt-5/5.9/default.nix index 755e6a9487e..fbf0001220b 100644 --- a/pkgs/development/libraries/qt-5/5.9/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/default.nix @@ -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; }; diff --git a/pkgs/development/libraries/qt-5/modules/qtmacextras.nix b/pkgs/development/libraries/qt-5/modules/qtmacextras.nix index 5a3b1fe35cd..3f254885986 100644 --- a/pkgs/development/libraries/qt-5/modules/qtmacextras.nix +++ b/pkgs/development/libraries/qt-5/modules/qtmacextras.nix @@ -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; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ef266154c07..9d72551dbdb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11941,6 +11941,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; }); @@ -11956,8 +11957,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);