Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f9cb527902af
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 85cbd5391a3f
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 13, 2018

  1. qtlocation: fix darwin build 

    A dependency (boost) makes use of `std::auto_ptr`, which is no longer
supported in C++17 in Clang. This change re-enables `std::auto_ptr`
capabilities.

(cherry picked from commit 833851c)
    @badmutex @LnL7
    badmutex authored and LnL7 committed Mar 13, 2018
    Copy the full SHA
    85cbd53 View commit details
Showing with 8 additions and 1 deletion.
  1. +8 −1 pkgs/development/libraries/qt-5/modules/qtlocation.nix
9 changes: 8 additions & 1 deletion pkgs/development/libraries/qt-5/modules/qtlocation.nix
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
{ qtModule, qtbase, qtmultimedia }:
{ stdenv, qtModule, qtbase, qtmultimedia }:

qtModule {
name = "qtlocation";
qtInputs = [ qtbase qtmultimedia ];
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"
];

}