cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

qt6.qtbase: disable cxx17 features on darwin

Browse source
This commit is contained in:
Weijia Wang 2023-01-10 14:58:18 +01:00
parent 09091c7521
commit 95df79b063
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/libraries/qt-6/modules/qtbase.nix
View file

@ -225,6 +225,8 @@ stdenv.mkDerivation rec {
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
# build as a set of dynamic libraries # build as a set of dynamic libraries
"-DFEATURE_framework=OFF" "-DFEATURE_framework=OFF"
# error: 'path' is unavailable: introduced in macOS 10.15
"-DQT_FEATURE_cxx17_filesystem=OFF"
]; ];
NIX_LDFLAGS = toString (lib.optionals stdenv.isDarwin [ NIX_LDFLAGS = toString (lib.optionals stdenv.isDarwin [

6
pkgs/development/libraries/qtpbfimageplugin/default.nix
View file

@ -27,12 +27,6 @@ stdenv.mkDerivation rec {
--replace '$$PROTOBUF/lib/libprotobuf-lite.a' '${protobuf}/lib/libprotobuf-lite.dylib' --replace '$$PROTOBUF/lib/libprotobuf-lite.a' '${protobuf}/lib/libprotobuf-lite.dylib'
''; '';
# error: 'path' is unavailable: introduced in macOS 10.15
qmakeFlags = lib.optionals stdenv.isDarwin [
"CONFIG+=c++17"
"QMAKE_MACOSX_DEPLOYMENT_TARGET=10.15"
];
meta = with lib; { meta = with lib; {
description = "Qt image plugin for displaying Mapbox vector tiles"; description = "Qt image plugin for displaying Mapbox vector tiles";
longDescription = '' longDescription = ''