BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

qt5.qtmacextras: include cf-private on darwin

Browse source 
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
This commit is contained in:
Daiderd Jordan 2018-11-17 20:59:38 +01:00
parent 41391e9cd8
commit 942d90b282
No known key found for this signature in database
GPG key ID: D02435D05B810C96
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

@ -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);