From 8d77e899e89f8828b211ee66265aa177ad038eca Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 26 Sep 2021 04:46:57 +0000 Subject: [PATCH] sasquatch: drop blanket -Werror (fix gcc-11 build) (#139350) Noticed build failure on gcc-11: $ nix-build -E 'with import ./.{}; sasquatch.override { stdenv = gcc11Stdenv; }' unsquashfs.c:1908:5: error: this 'if' clause does not guard... [-Werror=misleading-indentation] 1908 | if(swap) | ^~ Let's defer warning squashing and code fixes to upstream. --- pkgs/tools/filesystems/sasquatch/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/filesystems/sasquatch/default.nix b/pkgs/tools/filesystems/sasquatch/default.nix index 238223c4981e..017fda14cc65 100644 --- a/pkgs/tools/filesystems/sasquatch/default.nix +++ b/pkgs/tools/filesystems/sasquatch/default.nix @@ -43,6 +43,9 @@ stdenv.mkDerivation rec { patchFlags = [ "-p0" ]; postPatch = '' + # Drop blanket -Werror to avoid build failure on fresh toolchains + # like gcc-11. + substituteInPlace squashfs-tools/Makefile --replace ' -Werror' ' ' cd squashfs-tools '';