Unverified Commit dd9fbf60 authored by Sam's avatar Sam
Browse files

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.
parent 8e19f0f9

pkgs/development/libraries/qt-6/modules/qtbase/default.nix

+3 −0
Original line number Diff line number Diff line
@@ -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}"