diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-02-06 18:58:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-06 18:58:44 +0100 |
| commit | 5e32ae261893eab62d7ddc064cccf37e8eb1fd9a (patch) | |
| tree | dc782156814a5f31e6a61aca3cc67f016dcda73f | |
| parent | 50981b1486c6fea1892f4e1f4e92e9c85f9ede93 (diff) | |
| parent | cd10a33b63dcb543953d86a4a3a2104379cfc8ac (diff) | |
| download | nixpkgs-5e32ae261893eab62d7ddc064cccf37e8eb1fd9a.tar nixpkgs-5e32ae261893eab62d7ddc064cccf37e8eb1fd9a.tar.gz nixpkgs-5e32ae261893eab62d7ddc064cccf37e8eb1fd9a.tar.bz2 nixpkgs-5e32ae261893eab62d7ddc064cccf37e8eb1fd9a.tar.lz nixpkgs-5e32ae261893eab62d7ddc064cccf37e8eb1fd9a.tar.xz nixpkgs-5e32ae261893eab62d7ddc064cccf37e8eb1fd9a.tar.zst nixpkgs-5e32ae261893eab62d7ddc064cccf37e8eb1fd9a.zip | |
Merge pull request #214968 from wegank/qt6-darwin
qt6.qtbase: fix regression
| -rw-r--r-- | pkgs/development/libraries/qt-6/modules/qtbase.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/qt-6/modules/qtbase.nix b/pkgs/development/libraries/qt-6/modules/qtbase.nix index 6da193bbd5f..e71b0a7613d 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase.nix @@ -222,8 +222,8 @@ stdenv.mkDerivation rec { "-DQT_FEATURE_journald=${if systemdSupport then "ON" else "OFF"}" "-DQT_FEATURE_vulkan=ON" ] ++ lib.optionals stdenv.isDarwin [ - # build as a set of dynamic libraries - "-DFEATURE_framework=OFF" + # error: 'path' is unavailable: introduced in macOS 10.15 + "-DQT_FEATURE_cxx17_filesystem=OFF" ]; NIX_LDFLAGS = toString (lib.optionals stdenv.isDarwin [ |