Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

qt5.qtmacextras: include cf-private on darwin

Undefined symbols for architecture x86_64:
"_OBJC_CLASS_$_NSData", referenced from:
objc-class-ref in qmacfunctions.o
"_OBJC_CLASS_$_NSMutableArray", referenced from:
objc-class-ref in qmactoolbar.o
objc-class-ref in qmactoolbardelegate.o
ld: symbol(s) not found for architecture x86_64

+16 -6
+4 -1
pkgs/development/libraries/qt-5/5.11/default.nix
··· 20 20 stdenv, fetchurl, fetchFromGitHub, makeSetupHook, 21 21 bison, cups ? null, harfbuzz, libGL, perl, 22 22 gstreamer, gst-plugins-base, gtk3, dconf, 23 + cf-private, 23 24 24 25 # options 25 26 developerBuild ? false, ··· 95 96 qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {}; 96 97 qtimageformats = callPackage ../modules/qtimageformats.nix {}; 97 98 qtlocation = callPackage ../modules/qtlocation.nix {}; 98 - qtmacextras = callPackage ../modules/qtmacextras.nix {}; 99 + qtmacextras = callPackage ../modules/qtmacextras.nix { 100 + inherit cf-private; 101 + }; 99 102 qtmultimedia = callPackage ../modules/qtmultimedia.nix { 100 103 inherit gstreamer gst-plugins-base; 101 104 };
+4 -1
pkgs/development/libraries/qt-5/5.9/default.nix
··· 20 20 stdenv, fetchurl, makeSetupHook, 21 21 bison, cups ? null, harfbuzz, libGL, perl, 22 22 gstreamer, gst-plugins-base, gtk3, dconf, 23 + cf-private, 23 24 24 25 # options 25 26 developerBuild ? false, ··· 78 79 qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {}; 79 80 qtimageformats = callPackage ../modules/qtimageformats.nix {}; 80 81 qtlocation = callPackage ../modules/qtlocation.nix {}; 81 - qtmacextras = callPackage ../modules/qtmacextras.nix {}; 82 + qtmacextras = callPackage ../modules/qtmacextras.nix { 83 + inherit cf-private; 84 + }; 82 85 qtmultimedia = callPackage ../modules/qtmultimedia.nix { 83 86 inherit gstreamer gst-plugins-base; 84 87 };
+5 -3
pkgs/development/libraries/qt-5/modules/qtmacextras.nix
··· 1 - { qtModule, qtbase, lib }: 1 + { stdenv, qtModule, qtbase, cf-private }: 2 2 3 3 qtModule { 4 4 name = "qtmacextras"; 5 - qtInputs = [ qtbase ]; 6 - meta = with lib; { 5 + qtInputs = [ qtbase ] 6 + # Needed for _OBJC_CLASS_$_NSData symbols. 7 + ++ stdenv.lib.optional stdenv.isDarwin cf-private; 8 + meta = with stdenv.lib; { 7 9 maintainers = with maintainers; [ periklis ]; 8 10 platforms = platforms.darwin; 9 11 };
+3 -1
pkgs/top-level/all-packages.nix
··· 11941 11941 harfbuzz = harfbuzzFull; 11942 11942 inherit libGL; 11943 11943 inherit perl; 11944 + inherit (darwin) cf-private; 11944 11945 inherit (gst_all_1) gstreamer gst-plugins-base; 11945 11946 inherit (gnome3) gtk3 dconf; 11946 11947 }); ··· 11956 11957 harfbuzz = harfbuzzFull; 11957 11958 inherit libGL; 11958 11959 inherit perl; 11960 + inherit (darwin) cf-private; 11961 + inherit (gnome3) gtk3 dconf; 11959 11962 inherit (gst_all_1) gstreamer gst-plugins-base; 11960 - inherit (gnome3) gtk3 dconf; 11961 11963 }); 11962 11964 11963 11965 libsForQt511 = recurseIntoAttrs (lib.makeScope qt511.newScope mkLibsForQt5);