MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 23:03:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #36847 from badi/qtlocation

Browse source 
qtlocation: fix darwin build
This commit is contained in:
Daiderd Jordan 2018-03-14 00:14:53 +01:00 committed by GitHub
commit ecbb9027ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/development/libraries/qt-5/modules/qtlocation.nix
View file

@ -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"
];
}