public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qt512: fix build on darwin

Browse Source
This commit is contained in:
Thomas Tuegel 2021-01-01 05:32:19 -06:00
parent 9960088893
commit a61f20e418
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
2 changed files with 11 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/libraries/qt-5/5.12/default.nix
View File

@ -51,7 +51,7 @@ let
patches = { patches = {
qtbase = qtbase =
optionals stdenv.isDarwin [ [
./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch ./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
./qtbase.patch.d/0002-qtbase-mac.patch ./qtbase.patch.d/0002-qtbase-mac.patch
./qtbase.patch.d/0013-define-kiosurfacesuccess.patch ./qtbase.patch.d/0013-define-kiosurfacesuccess.patch
@ -59,8 +59,7 @@ let
# Patch framework detection to support X.framework/X.tbd, # Patch framework detection to support X.framework/X.tbd,
# extending the current support for X.framework/X. # extending the current support for X.framework/X.
./qtbase.patch.d/0015-qtbase-tbd-frameworks.patch ./qtbase.patch.d/0015-qtbase-tbd-frameworks.patch
]
++ [
./qtbase.patch.d/0003-qtbase-mkspecs.patch ./qtbase.patch.d/0003-qtbase-mkspecs.patch
./qtbase.patch.d/0004-qtbase-replace-libdir.patch ./qtbase.patch.d/0004-qtbase-replace-libdir.patch
./qtbase.patch.d/0005-qtbase-cmake.patch ./qtbase.patch.d/0005-qtbase-cmake.patch
@ -97,7 +96,7 @@ let
stripLen = 1; stripLen = 1;
extraPrefix = "src/3rdparty/"; extraPrefix = "src/3rdparty/";
}) })
] ++ optionals stdenv.isDarwin [
./qtwebengine-darwin-no-platform-check.patch ./qtwebengine-darwin-no-platform-check.patch
./qtwebengine-darwin-fix-failed-static-assertion.patch ./qtwebengine-darwin-fix-failed-static-assertion.patch
]; ];
@ -108,7 +107,7 @@ let
sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n"; sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n";
}) })
./qtwebkit.patch ./qtwebkit.patch
] ++ optionals stdenv.isDarwin [
./qtwebkit-darwin-no-readline.patch ./qtwebkit-darwin-no-readline.patch
./qtwebkit-darwin-no-qos-classes.patch ./qtwebkit-darwin-no-qos-classes.patch
]; ];

30
pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
View File

@ -1,18 +1,5 @@
From 361a9395704ca1ee170a8bb3823ba860293eecee Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 17 Sep 2019 05:34:00 -0500
Subject: [PATCH 01/12] qtbase-mkspecs-mac
---
mkspecs/common/mac.conf | 2 +-
mkspecs/features/mac/default_post.prf | 202 ----------------------------------
mkspecs/features/mac/default_pre.prf | 58 ----------
mkspecs/features/mac/sdk.mk | 25 -----
mkspecs/features/mac/sdk.prf | 61 ----------
5 files changed, 1 insertion(+), 347 deletions(-)
diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf
index b77494ec9b..470c38e772 100644 index b77494ec..470c38e7 100644
--- a/mkspecs/common/mac.conf --- a/mkspecs/common/mac.conf
+++ b/mkspecs/common/mac.conf +++ b/mkspecs/common/mac.conf
@@ -24,7 +24,7 @@ QMAKE_INCDIR_OPENGL = \ @@ -24,7 +24,7 @@ QMAKE_INCDIR_OPENGL = \
@ -25,7 +12,7 @@ index b77494ec9b..470c38e772 100644
QMAKE_LFLAGS_REL_RPATH = QMAKE_LFLAGS_REL_RPATH =
diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf
index 993f4d56a9..b80ec1e801 100644 index d052808c..b80ec1e8 100644
--- a/mkspecs/features/mac/default_post.prf --- a/mkspecs/features/mac/default_post.prf
+++ b/mkspecs/features/mac/default_post.prf +++ b/mkspecs/features/mac/default_post.prf
@@ -68,208 +68,6 @@ qt { @@ -68,208 +68,6 @@ qt {
@ -161,7 +148,7 @@ index 993f4d56a9..b80ec1e801 100644
- -isysroot$$xcodeSDKInfo(Path, $$sdk) - -isysroot$$xcodeSDKInfo(Path, $$sdk)
- QMAKE_XARCH_LFLAGS_$${arch} = $$version_min_flags \ - QMAKE_XARCH_LFLAGS_$${arch} = $$version_min_flags \
- -Xarch_$${arch} \ - -Xarch_$${arch} \
- -Wl,-syslibroot,$$xcodeSDKInfo(Path, $$sdk) - -isysroot$$xcodeSDKInfo(Path, $$sdk)
- -
- QMAKE_XARCH_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS_$${arch}) - QMAKE_XARCH_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS_$${arch})
- QMAKE_XARCH_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS_$${arch}) - QMAKE_XARCH_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS_$${arch})
@ -182,7 +169,7 @@ index 993f4d56a9..b80ec1e801 100644
- version_min_flag = -m$${version_identifier}-version-min=$$deployment_target - version_min_flag = -m$${version_identifier}-version-min=$$deployment_target
- QMAKE_CFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag - QMAKE_CFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag
- QMAKE_CXXFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag - QMAKE_CXXFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag
- QMAKE_LFLAGS += -Wl,-syslibroot,$$QMAKE_MAC_SDK_PATH $$version_min_flag - QMAKE_LFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag
- } - }
- -
- # Enable precompiled headers for multiple architectures - # Enable precompiled headers for multiple architectures
@ -238,7 +225,7 @@ index 993f4d56a9..b80ec1e801 100644
generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode \"$(EXPORT__PRO_FILE_)\" $$QMAKE_ARGS generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode \"$(EXPORT__PRO_FILE_)\" $$QMAKE_ARGS
generate_xcode_project.target = xcodeproj generate_xcode_project.target = xcodeproj
diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf
index e3534561a5..3b01424e67 100644 index e3534561..3b01424e 100644
--- a/mkspecs/features/mac/default_pre.prf --- a/mkspecs/features/mac/default_pre.prf
+++ b/mkspecs/features/mac/default_pre.prf +++ b/mkspecs/features/mac/default_pre.prf
@@ -1,60 +1,2 @@ @@ -1,60 +1,2 @@
@ -303,7 +290,7 @@ index e3534561a5..3b01424e67 100644
-xcode_copy_phase_strip_setting.value = NO -xcode_copy_phase_strip_setting.value = NO
-QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting -QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting
diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk
index c40f58c987..e69de29bb2 100644 index c40f58c9..e69de29b 100644
--- a/mkspecs/features/mac/sdk.mk --- a/mkspecs/features/mac/sdk.mk
+++ b/mkspecs/features/mac/sdk.mk +++ b/mkspecs/features/mac/sdk.mk
@@ -1,25 +0,0 @@ @@ -1,25 +0,0 @@
@ -333,7 +320,7 @@ index c40f58c987..e69de29bb2 100644
- endif - endif
-endif -endif
diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf
index 3a9c2778bb..e69de29bb2 100644 index 3a9c2778..e69de29b 100644
--- a/mkspecs/features/mac/sdk.prf --- a/mkspecs/features/mac/sdk.prf
+++ b/mkspecs/features/mac/sdk.prf +++ b/mkspecs/features/mac/sdk.prf
@@ -1,61 +0,0 @@ @@ -1,61 +0,0 @@
@ -398,6 +385,3 @@ index 3a9c2778bb..e69de29bb2 100644
- $$tool = $$sysrooted $$member(value, 1, -1) - $$tool = $$sysrooted $$member(value, 1, -1)
- cache($$tool_variable, set stash, $$tool) - cache($$tool_variable, set stash, $$tool)
-} -}
--
2.23.GIT