qt6.qtbase: override bad cmakeFlag in setup hook; fix finding frameworks
This essentially applies https://github.com/NixOS/nixpkgs/pull/455592 to qtbase (and thus all packages depending on Qt on Darwin) without rebuilding the world. We're doing this so that Qt-based applications will be fixed faster than the time it takes to wait for a staging cycle.
This commit is contained in:
@@ -292,6 +292,9 @@ stdenv.mkDerivation rec {
|
||||
# When this variable is not set, cmake tries to execute xcodebuild
|
||||
# to query the version.
|
||||
"-DQT_INTERNAL_XCODE_VERSION=0.1"
|
||||
# This should be removed once https://github.com/NixOS/nixpkgs/pull/455592 makes it to master
|
||||
# as it will become redundant.
|
||||
"-DCMAKE_FIND_FRAMEWORK=FIRST"
|
||||
]
|
||||
++ lib.optionals isCrossBuild [
|
||||
"-DQT_HOST_PATH=${pkgsBuildBuild.qt6.qtbase}"
|
||||
|
||||
Reference in New Issue
Block a user