diff options
| author | Vladimír Čunát <v@cunat.cz> | 2022-04-18 20:27:58 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2022-04-18 20:30:08 +0200 |
| commit | 1dfcf7d2e7515d5856d7756c39e7fe9c0a9e5484 (patch) | |
| tree | 2076339e72b5ef438d2789aab22c6330b11f843b | |
| parent | 92339213138d1e867af6397b8f88c13363b19cb1 (diff) | |
| download | nixpkgs-1dfcf7d2e7515d5856d7756c39e7fe9c0a9e5484.tar nixpkgs-1dfcf7d2e7515d5856d7756c39e7fe9c0a9e5484.tar.gz nixpkgs-1dfcf7d2e7515d5856d7756c39e7fe9c0a9e5484.tar.bz2 nixpkgs-1dfcf7d2e7515d5856d7756c39e7fe9c0a9e5484.tar.lz nixpkgs-1dfcf7d2e7515d5856d7756c39e7fe9c0a9e5484.tar.xz nixpkgs-1dfcf7d2e7515d5856d7756c39e7fe9c0a9e5484.tar.zst nixpkgs-1dfcf7d2e7515d5856d7756c39e7fe9c0a9e5484.zip | |
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.
| -rw-r--r-- | pkgs/development/libraries/liblastfm/default.nix | 5 |
1 files changed, 4 insertions, 1 deletions
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; |