From cbfbe9ca1ec40856c9456b11f2ee7f20a7d21f22 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 19 Jun 2019 20:28:41 +0200
Subject: [PATCH] qt: remove cf-private
---
pkgs/development/libraries/qt-4.x/4.8/default.nix | 4 ++--
pkgs/development/libraries/qt-5/5.11/default.nix | 10 +++-------
pkgs/development/libraries/qt-5/5.12/default.nix | 10 +++-------
pkgs/development/libraries/qt-5/5.6/default.nix | 5 +----
pkgs/development/libraries/qt-5/5.9/default.nix | 9 ++-------
pkgs/development/libraries/qt-5/modules/qtbase.nix | 2 --
.../libraries/qt-5/modules/qtconnectivity.nix | 4 ++--
.../development/libraries/qt-5/modules/qtmacextras.nix | 6 ++----
.../development/libraries/qt-5/modules/qtwebengine.nix | 8 --------
pkgs/development/libraries/qt-5/modules/qtwebkit.nix | 2 +-
pkgs/development/libraries/qt-5/modules/qtwebview.nix | 10 ++--------
pkgs/top-level/all-packages.nix | 6 +-----
12 files changed, 19 insertions(+), 57 deletions(-)
diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index 34ef7463817..afd2a01e722 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -14,7 +14,7 @@
, examples ? false
, demos ? false
# darwin support
-, cf-private, libobjc, ApplicationServices, OpenGL, Cocoa, AGL, libcxx
+, libobjc, ApplicationServices, OpenGL, Cocoa, AGL, libcxx
}:
let
@@ -189,7 +189,7 @@ stdenv.mkDerivation rec {
postgresql sqlite libjpeg libmng libtiff icu ]
++ lib.optionals (mysql != null) [ mysql.connector-c ]
++ lib.optionals gtkStyle [ gtk2 gdk_pixbuf ]
- ++ lib.optionals stdenv.isDarwin [ cf-private ApplicationServices OpenGL Cocoa AGL libcxx libobjc ];
+ ++ lib.optionals stdenv.isDarwin [ ApplicationServices OpenGL Cocoa AGL libcxx libobjc ];
nativeBuildInputs = [ perl pkgconfig which ];
diff --git a/pkgs/development/libraries/qt-5/5.11/default.nix b/pkgs/development/libraries/qt-5/5.11/default.nix
index f43329d3553..fe01b89081f 100644
--- a/pkgs/development/libraries/qt-5/5.11/default.nix
+++ b/pkgs/development/libraries/qt-5/5.11/default.nix
@@ -20,7 +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, llvmPackages_5,
+ llvmPackages_5,
# options
developerBuild ? false,
@@ -92,17 +92,13 @@ let
};
qtcharts = callPackage ../modules/qtcharts.nix {};
- qtconnectivity = callPackage ../modules/qtconnectivity.nix {
- inherit cf-private;
- };
+ qtconnectivity = callPackage ../modules/qtconnectivity.nix {};
qtdeclarative = callPackage ../modules/qtdeclarative.nix {};
qtdoc = callPackage ../modules/qtdoc.nix {};
qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {};
qtimageformats = callPackage ../modules/qtimageformats.nix {};
qtlocation = callPackage ../modules/qtlocation.nix { };
- qtmacextras = callPackage ../modules/qtmacextras.nix {
- inherit cf-private;
- };
+ qtmacextras = callPackage ../modules/qtmacextras.nix {};
qtmultimedia = callPackage ../modules/qtmultimedia.nix {
inherit gstreamer gst-plugins-base;
};
diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix
index 2aa7d0f71ee..57b89dd4386 100644
--- a/pkgs/development/libraries/qt-5/5.12/default.nix
+++ b/pkgs/development/libraries/qt-5/5.12/default.nix
@@ -20,7 +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, llvmPackages_5,
+ llvmPackages_5,
# options
developerBuild ? false,
@@ -97,17 +97,13 @@ let
};
qtcharts = callPackage ../modules/qtcharts.nix {};
- qtconnectivity = callPackage ../modules/qtconnectivity.nix {
- inherit cf-private;
- };
+ qtconnectivity = callPackage ../modules/qtconnectivity.nix {};
qtdeclarative = callPackage ../modules/qtdeclarative.nix {};
qtdoc = callPackage ../modules/qtdoc.nix {};
qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {};
qtimageformats = callPackage ../modules/qtimageformats.nix {};
qtlocation = callPackage ../modules/qtlocation.nix {};
- qtmacextras = callPackage ../modules/qtmacextras.nix {
- inherit cf-private;
- };
+ qtmacextras = callPackage ../modules/qtmacextras.nix {};
qtmultimedia = callPackage ../modules/qtmultimedia.nix {
inherit gstreamer gst-plugins-base;
};
diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix
index e493fc169ab..bf0ae42ea1f 100644
--- a/pkgs/development/libraries/qt-5/5.6/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/default.nix
@@ -29,7 +29,6 @@ existing packages here and modify it as necessary.
stdenv, fetchurl, fetchpatch, makeSetupHook,
bison, cups ? null, harfbuzz, libGL, perl,
gstreamer, gst-plugins-base,
- cf-private,
# options
developerBuild ? false,
@@ -133,9 +132,7 @@ let
/* qtactiveqt = not packaged */
/* qtandroidextras = not packaged */
/* qtcanvas3d = not packaged */
- qtconnectivity = callPackage ../modules/qtconnectivity.nix {
- inherit cf-private;
- };
+ qtconnectivity = callPackage ../modules/qtconnectivity.nix {};
qtdeclarative = callPackage ../modules/qtdeclarative.nix {};
qtdoc = callPackage ../modules/qtdoc.nix {};
qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {};
diff --git a/pkgs/development/libraries/qt-5/5.9/default.nix b/pkgs/development/libraries/qt-5/5.9/default.nix
index 9baca8124bd..e59b6b90105 100644
--- a/pkgs/development/libraries/qt-5/5.9/default.nix
+++ b/pkgs/development/libraries/qt-5/5.9/default.nix
@@ -20,7 +20,6 @@ top-level attribute to `top-level/all-packages.nix`.
stdenv, fetchurl, fetchpatch, makeSetupHook,
bison, cups ? null, harfbuzz, libGL, perl,
gstreamer, gst-plugins-base, gtk3, dconf,
- cf-private,
# options
developerBuild ? false,
@@ -94,17 +93,13 @@ let
};
qtcharts = callPackage ../modules/qtcharts.nix {};
- qtconnectivity = callPackage ../modules/qtconnectivity.nix {
- inherit cf-private;
- };
+ qtconnectivity = callPackage ../modules/qtconnectivity.nix {};
qtdeclarative = callPackage ../modules/qtdeclarative.nix {};
qtdoc = callPackage ../modules/qtdoc.nix {};
qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {};
qtimageformats = callPackage ../modules/qtimageformats.nix {};
qtlocation = callPackage ../modules/qtlocation.nix {};
- qtmacextras = callPackage ../modules/qtmacextras.nix {
- inherit cf-private;
- };
+ qtmacextras = callPackage ../modules/qtmacextras.nix {};
qtmultimedia = callPackage ../modules/qtmultimedia.nix {
inherit gstreamer gst-plugins-base;
};
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
index 2c050a105b8..458946b803d 100644
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -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
diff --git a/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix b/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix
index 17e7f0ee7cf..36a736d03dc 100644
--- a/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix
@@ -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" ];
}
diff --git a/pkgs/development/libraries/qt-5/modules/qtmacextras.nix b/pkgs/development/libraries/qt-5/modules/qtmacextras.nix
index 3f254885986..11964caf17b 100644
--- a/pkgs/development/libraries/qt-5/modules/qtmacextras.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtmacextras.nix
@@ -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;
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
index aa9cdb4d5ae..07fd048d653 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
@@ -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";
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
index 40f4c56e809..d65449023b3 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
@@ -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
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebview.nix b/pkgs/development/libraries/qt-5/modules/qtwebview.nix
index 6d5274cbc58..906d750c5d3 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebview.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebview.nix
@@ -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";
-}
\ No newline at end of file
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d27f2e5a7a8..1f0ab6a2181 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12757,7 +12757,7 @@ in
# XXX: mariadb doesn't built on fbsd as of nov 2015
mysql = if (!stdenv.isFreeBSD) then mysql else null;
- inherit (pkgs.darwin) cf-private libobjc;
+ inherit (pkgs.darwin) libobjc;
inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices OpenGL Cocoa AGL;
};
@@ -12783,7 +12783,6 @@ in
harfbuzz = harfbuzzFull;
inherit libGL;
inherit perl;
- inherit (darwin) cf-private;
inherit (gst_all_1) gstreamer gst-plugins-base;
});
@@ -12798,7 +12797,6 @@ in
harfbuzz = harfbuzzFull;
inherit libGL;
inherit perl;
- inherit (darwin) cf-private;
inherit (gst_all_1) gstreamer gst-plugins-base;
inherit gtk3;
inherit (gnome3) dconf;
@@ -12815,7 +12813,6 @@ in
harfbuzz = harfbuzzFull;
inherit libGL;
inherit perl;
- inherit (darwin) cf-private;
inherit gtk3;
inherit (gnome3) dconf;
inherit (gst_all_1) gstreamer gst-plugins-base;
@@ -12833,7 +12830,6 @@ in
harfbuzz = harfbuzzFull;
inherit libGL;
inherit perl;
- inherit (darwin) cf-private;
inherit gtk3;
inherit (gnome3) dconf;
inherit (gst_all_1) gstreamer gst-plugins-base;