From 60266eb504938631d2162a1fba3044eaa0d62d91 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 3 Aug 2019 11:10:41 -0400 Subject: [PATCH] glib: add cflag G_DISABLE_CAST_CHECKS This is what would have been passed before with the release buildtype. See: https://gitlab.gnome.org/GNOME/glib/blob/2.60.4/meson.build#L208 --- pkgs/development/libraries/glib/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index ecbcbea1394..ed7c66946fa 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -98,8 +98,12 @@ stdenv.mkDerivation rec { LC_ALL = "en_US.UTF-8"; - NIX_CFLAGS_COMPILE = (optional stdenv.isSunOS "-DBSD_COMP") - ++ [ "-Wno-error=nonnull" ]; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=nonnull" + # Default for release buildtype but passed manually because + # we're using plain + "-DG_DISABLE_CAST_CHECKS" + ] ++ optional stdenv.isSunOS "-DBSD_COMP"; postPatch = '' # substitute fix-gio-launch-desktop-path.patch