Merge pull request #36847 from badi/qtlocation
qtlocation: fix darwin build
This commit is contained in:
commit
ecbb9027ea
@ -1,4 +1,4 @@
|
||||
{ qtModule, qtbase, qtmultimedia }:
|
||||
{ stdenv, qtModule, qtbase, qtmultimedia }:
|
||||
|
||||
qtModule {
|
||||
name = "qtlocation";
|
||||
@ -6,4 +6,11 @@ qtModule {
|
||||
outputs = [ "bin" "out" "dev" ];
|
||||
# Linking with -lclipper fails with parallel build enabled
|
||||
enableParallelBuilding = false;
|
||||
qmakeFlags = stdenv.lib.optional stdenv.isDarwin [
|
||||
# boost uses std::auto_ptr which has been disabled in clang with libcxx
|
||||
# This flag re-enables this feature
|
||||
# https://libcxx.llvm.org/docs/UsingLibcxx.html#c-17-specific-configuration-macros
|
||||
"QMAKE_CXXFLAGS+=-D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR"
|
||||
];
|
||||
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user