qt: remove cf-private

This commit is contained in:
Daiderd Jordan
2019-07-03 22:20:16 +02:00
parent 0fb071fd00
commit cbfbe9ca1e
12 changed files with 19 additions and 57 deletions
@@ -78,8 +78,6 @@ stdenv.mkDerivation {
[ libinput ]
++ lib.optional withGtk3 gtk3
)
# Needed for OBJC_CLASS_$_NSDate symbols.
++ lib.optional stdenv.isDarwin darwin.cf-private
++ lib.optional developerBuild gdb
++ lib.optional (cups != null) cups
++ lib.optional (mysql != null) mysql.connector-c
@@ -1,8 +1,8 @@
{ qtModule, stdenv, qtbase, qtdeclarative, bluez, cf-private }:
{ qtModule, stdenv, qtbase, qtdeclarative, bluez }:
qtModule {
name = "qtconnectivity";
qtInputs = [ qtbase qtdeclarative ];
buildInputs = if stdenv.isDarwin then [ cf-private ] else [ bluez ];
buildInputs = stdenv.lib.optional stdenv.isLinux bluez;
outputs = [ "out" "dev" "bin" ];
}
@@ -1,10 +1,8 @@
{ stdenv, qtModule, qtbase, cf-private }:
{ stdenv, qtModule, qtbase }:
qtModule {
name = "qtmacextras";
qtInputs = [ qtbase ]
# Needed for _OBJC_CLASS_$_NSData symbols.
++ stdenv.lib.optional stdenv.isDarwin cf-private;
qtInputs = [ qtbase ];
meta = with stdenv.lib; {
maintainers = with maintainers; [ periklis ];
platforms = platforms.darwin;
@@ -200,14 +200,6 @@ EOF
(runCommand "MacOS_SDK_sandbox.h" {} ''
install -Dm444 "${lib.getDev darwin.apple_sdk.sdk}"/include/sandbox.h "$out"/include/sandbox.h
'')
# For:
# _NSDefaultRunLoopMode
# _OBJC_CLASS_$_NSDate
# _OBJC_CLASS_$_NSDictionary
# _OBJC_CLASS_$_NSRunLoop
# _OBJC_CLASS_$_NSURL
darwin.cf-private
]);
__impureHostDeps = optional stdenv.isDarwin "/usr/lib/libsandbox.1.dylib";
@@ -28,7 +28,7 @@ qtModule {
++ optional (stdenv.isDarwin && lib.versionAtLeast qtbase.version "5.9.0") qtmultimedia
++ optional usingAnnulenWebkitFork qtwebchannel;
buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base ]
++ optionals (stdenv.isDarwin) (with darwin; with apple_sdk.frameworks; [ cf-private ICU OpenGL ])
++ optionals (stdenv.isDarwin) (with darwin; with apple_sdk.frameworks; [ ICU OpenGL ])
++ optional usingAnnulenWebkitFork hyphen;
nativeBuildInputs = [
bison2 flex gdb gperf perl pkgconfig python2 ruby
@@ -1,20 +1,14 @@
{ darwin, stdenv, qtModule, qtdeclarative, qtwebengine }:
with stdenv.lib;
qtModule {
name = "qtwebview";
qtInputs = [ qtdeclarative qtwebengine ];
buildInputs = optional (stdenv.isDarwin) [
darwin.apple_sdk.frameworks.CoreFoundation
darwin.apple_sdk.frameworks.WebKit
# For:
# _OBJC_CLASS_$_NSArray
# _OBJC_CLASS_$_NSDate
# _OBJC_CLASS_$_NSURL
darwin.cf-private
];
outputs = [ "out" "dev" "bin" ];
NIX_LDFLAGS = optionalString stdenv.isDarwin "-framework CoreFoundation -framework WebKit";
}
}