mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 07:53:19 +00:00
qt510: disable framework build on macOS
We prefer to have $out/include & $out/lib installed so that things like multiple outputs can work. There is no way to do this in Qt currently without also disabling the ‘framework’ install. Not sure if this will break anything but it will fix issues we run into on some projects like python2.7-pyside: Linux: https://hydra.nixos.org/build/73219181 macOS: https://hydra.nixos.org/build/73059550 Hopefully this gives us consistency between the two.
This commit is contained in:
parent
882e08ced1
commit
c4cac55d69
@ -37,9 +37,7 @@ let
|
||||
srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; };
|
||||
|
||||
patches = {
|
||||
qtbase = [ ./qtbase.patch ] ++
|
||||
optionals stdenv.isDarwin [ ./qtbase-darwin.patch
|
||||
./restore-pc-files.patch ];
|
||||
qtbase = [ ./qtbase.patch ./qtbase-darwin.patch ];
|
||||
qtdeclarative = [ ./qtdeclarative.patch ];
|
||||
qtscript = [ ./qtscript.patch ];
|
||||
qtserialport = [ ./qtserialport.patch ];
|
||||
|
@ -1,27 +0,0 @@
|
||||
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
|
||||
index e6a0d97f1a..b50ce77d51 100644
|
||||
--- a/mkspecs/features/qt_module.prf
|
||||
+++ b/mkspecs/features/qt_module.prf
|
||||
@@ -266,7 +266,7 @@ load(qt_installs)
|
||||
load(qt_targets)
|
||||
|
||||
# this builds on top of qt_common
|
||||
-!internal_module:!lib_bundle:if(unix|mingw) {
|
||||
+!internal_module:if(unix|mingw) {
|
||||
CONFIG += create_pc
|
||||
QMAKE_PKGCONFIG_DESTDIR = pkgconfig
|
||||
host_build: \
|
||||
diff --git a/mkspecs/features/qt_module_headers.prf b/mkspecs/features/qt_module_headers.prf
|
||||
index 62b88c6fe2..f302f1e202 100644
|
||||
--- a/mkspecs/features/qt_module_headers.prf
|
||||
+++ b/mkspecs/features/qt_module_headers.prf
|
||||
@@ -102,8 +102,7 @@ git_build: \
|
||||
else: \
|
||||
INC_PATH = $$MODULE_BASE_INDIR
|
||||
include($$INC_PATH/include/$$MODULE_INCNAME/headers.pri, "", true)
|
||||
-!lib_bundle: \ # Headers are embedded into the bundle, so don't install them separately.
|
||||
- CONFIG += qt_install_headers
|
||||
+CONFIG += qt_install_headers
|
||||
|
||||
alien_syncqt: return()
|
||||
|
@ -16,6 +16,9 @@ let
|
||||
optional (!debug) "-DQT_NO_DEBUG"
|
||||
++ lib.toList (args.NIX_CFLAGS_COMPILE or []);
|
||||
|
||||
configureFlags = [ "-no-framework" ]
|
||||
++ (args.configureFlags or []);
|
||||
|
||||
cmakeFlags =
|
||||
(args.cmakeFlags or [])
|
||||
++ [
|
||||
|
Loading…
Reference in New Issue
Block a user