From 251ab5f3f61e2402833291d28ca6a19ec8839e2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Thu, 5 May 2022 16:50:43 -0500 Subject: [PATCH] gnome: fix compilation with gcc 11.3.0 A new warning (`-Werror=overlength-strings`) is causing issues due to a recent gcc version upgrade --- pkgs/desktops/gnome/apps/cheese/default.nix | 2 ++ pkgs/desktops/gnome/apps/gnome-maps/default.nix | 2 ++ pkgs/desktops/gnome/apps/gnome-music/default.nix | 2 ++ pkgs/desktops/gnome/core/gnome-shell/default.nix | 2 ++ pkgs/desktops/gnome/core/totem/default.nix | 2 ++ 5 files changed, 10 insertions(+) diff --git a/pkgs/desktops/gnome/apps/cheese/default.nix b/pkgs/desktops/gnome/apps/cheese/default.nix index a6d70d162c0..308a30dde29 100644 --- a/pkgs/desktops/gnome/apps/cheese/default.nix +++ b/pkgs/desktops/gnome/apps/cheese/default.nix @@ -80,6 +80,8 @@ stdenv.mkDerivation rec { pipewire # PipeWire provides a gstreamer plugin for using PipeWire for video ]; + NIX_CFLAGS_COMPILE = "-Wno-error=overlength-strings"; + postPatch = '' chmod +x meson_post_install.py patchShebangs meson_post_install.py diff --git a/pkgs/desktops/gnome/apps/gnome-maps/default.nix b/pkgs/desktops/gnome/apps/gnome-maps/default.nix index a0d566c7ef9..1280c15f213 100644 --- a/pkgs/desktops/gnome/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-maps/default.nix @@ -69,6 +69,8 @@ stdenv.mkDerivation rec { webkitgtk ]; + NIX_CFLAGS_COMPILE = "-Wno-error=overlength-strings"; + postPatch = '' chmod +x meson_post_install.py # patchShebangs requires executable file patchShebangs meson_post_install.py diff --git a/pkgs/desktops/gnome/apps/gnome-music/default.nix b/pkgs/desktops/gnome/apps/gnome-music/default.nix index 8d5f5e5f28d..40f85b8a59c 100644 --- a/pkgs/desktops/gnome/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-music/default.nix @@ -76,6 +76,8 @@ python3.pkgs.buildPythonApplication rec { gst-plugins-ugly ]); + NIX_CFLAGS_COMPILE = "-Wno-error=overlength-strings"; + pythonPath = with python3.pkgs; [ pycairo dbus-python diff --git a/pkgs/desktops/gnome/core/gnome-shell/default.nix b/pkgs/desktops/gnome/core/gnome-shell/default.nix index 1ad36f7e96b..9d7e14898e2 100644 --- a/pkgs/desktops/gnome/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -175,6 +175,8 @@ stdenv.mkDerivation rec { pythonEnv ]; + NIX_CFLAGS_COMPILE = "-Wno-error=overlength-strings"; + mesonFlags = [ "-Dgtk_doc=true" ]; diff --git a/pkgs/desktops/gnome/core/totem/default.nix b/pkgs/desktops/gnome/core/totem/default.nix index 44e1319f8d4..af64e40a653 100644 --- a/pkgs/desktops/gnome/core/totem/default.nix +++ b/pkgs/desktops/gnome/core/totem/default.nix @@ -77,6 +77,8 @@ stdenv.mkDerivation rec { xvfb-run ]; + NIX_CFLAGS_COMPILE = "-Wno-error=overlength-strings"; + mesonFlags = [ # TODO: https://github.com/NixOS/nixpkgs/issues/36468 "-Dc_args=-I${glib.dev}/include/gio-unix-2.0"