diff options
| author | Vladimír Čunát <v@cunat.cz> | 2023-02-12 12:57:11 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-02-12 14:20:35 +0100 |
| commit | b5ace1ffc029c4fea5ab2344c0a77e459b3df4ed (patch) | |
| tree | 0417bea1438cf731a36f3bd13d650b358ce2cf07 | |
| parent | 95d2ac73ccc4722a86b21e7b087eae767c71c4d9 (diff) | |
| download | nixpkgs-b5ace1ffc029c4fea5ab2344c0a77e459b3df4ed.tar nixpkgs-b5ace1ffc029c4fea5ab2344c0a77e459b3df4ed.tar.gz nixpkgs-b5ace1ffc029c4fea5ab2344c0a77e459b3df4ed.tar.bz2 nixpkgs-b5ace1ffc029c4fea5ab2344c0a77e459b3df4ed.tar.lz nixpkgs-b5ace1ffc029c4fea5ab2344c0a77e459b3df4ed.tar.xz nixpkgs-b5ace1ffc029c4fea5ab2344c0a77e459b3df4ed.tar.zst nixpkgs-b5ace1ffc029c4fea5ab2344c0a77e459b3df4ed.zip | |
furnace, tvheadend: more fallout from gcc upgrade
| -rw-r--r-- | pkgs/applications/audio/furnace/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/tvheadend/default.nix | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/applications/audio/furnace/default.nix b/pkgs/applications/audio/furnace/default.nix index 3d3b87e3c5d..f0bb039a79c 100644 --- a/pkgs/applications/audio/furnace/default.nix +++ b/pkgs/applications/audio/furnace/default.nix @@ -63,8 +63,8 @@ stdenv.mkDerivation rec { "-DWARNINGS_ARE_ERRORS=ON" ]; - NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ - # Needed with GCC 12 but breaks on darwin (with clang) + NIX_CFLAGS_COMPILE = lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [ + # Needed with GCC 12 but breaks on darwin (with clang) or aarch64 (old gcc) "-Wno-error=mismatched-new-delete" "-Wno-error=use-after-free" ]; diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix index e9db31f792f..325632da48c 100644 --- a/pkgs/servers/tvheadend/default.nix +++ b/pkgs/servers/tvheadend/default.nix @@ -78,7 +78,8 @@ in stdenv.mkDerivation { NIX_CFLAGS_COMPILE = [ "-Wno-error=format-truncation" "-Wno-error=stringop-truncation" - # Needed with GCC 12 + ] ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [ + # Needed with GCC 12 but unrecognized with GCC 9 "-Wno-error=use-after-free" ]; |