diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-01-10 14:58:18 +0100 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-01-15 03:19:09 +0100 |
| commit | 95df79b06320962698220b87fbccbfa55a6da3dc (patch) | |
| tree | c81c40767cccc713f5b142455b511a93ef9af461 | |
| parent | 09091c7521e559542d0a720a9cccb363875d62e6 (diff) | |
| download | nixpkgs-95df79b06320962698220b87fbccbfa55a6da3dc.tar nixpkgs-95df79b06320962698220b87fbccbfa55a6da3dc.tar.gz nixpkgs-95df79b06320962698220b87fbccbfa55a6da3dc.tar.bz2 nixpkgs-95df79b06320962698220b87fbccbfa55a6da3dc.tar.lz nixpkgs-95df79b06320962698220b87fbccbfa55a6da3dc.tar.xz nixpkgs-95df79b06320962698220b87fbccbfa55a6da3dc.tar.zst nixpkgs-95df79b06320962698220b87fbccbfa55a6da3dc.zip | |
qt6.qtbase: disable cxx17 features on darwin
| -rw-r--r-- | pkgs/development/libraries/qt-6/modules/qtbase.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/qtpbfimageplugin/default.nix | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/pkgs/development/libraries/qt-6/modules/qtbase.nix b/pkgs/development/libraries/qt-6/modules/qtbase.nix index 8fec445fb94..d3aafe84ef7 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase.nix @@ -225,6 +225,8 @@ stdenv.mkDerivation rec { ] ++ 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 [ diff --git a/pkgs/development/libraries/qtpbfimageplugin/default.nix b/pkgs/development/libraries/qtpbfimageplugin/default.nix index 69a492180db..40e7e154914 100644 --- a/pkgs/development/libraries/qtpbfimageplugin/default.nix +++ b/pkgs/development/libraries/qtpbfimageplugin/default.nix @@ -27,12 +27,6 @@ stdenv.mkDerivation rec { --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; { description = "Qt image plugin for displaying Mapbox vector tiles"; longDescription = '' |