From 1dfcf7d2e7515d5856d7756c39e7fe9c0a9e5484 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 18 Apr 2022 20:27:58 +0200 Subject: [PATCH] libsForQt5.liblastfm: revert addition of flags on darwin Apparently on x86_64-darwin there are also C files compiled, and that doesn't go well with -std=c++* https://hydra.nixos.org/build/174111870 Fortunately the flag only seems needed with gcc 11 so far. --- pkgs/development/libraries/liblastfm/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix index d663ca9b71a..68658d20ba6 100644 --- a/pkgs/development/libraries/liblastfm/default.nix +++ b/pkgs/development/libraries/liblastfm/default.nix @@ -23,7 +23,10 @@ stdenv.mkDerivation rec { buildInputs = [ fftwSinglePrec libsamplerate qtbase ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration; - NIX_CFLAGS_COMPILE = [ "-std=c++11" ]; + NIX_CFLAGS_COMPILE = + lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") [ + "-std=c++11" + ]; dontWrapQtApps = true;