Merge pull request #65850 from worldofpeace/bye-g-disable-checks

glib,gtk: correct CLAGS for plain buildtype

pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix

@@ -95,6 +95,12 @@ stdenv.mkDerivation rec {
     "-Dudev_dir=${placeholder "out"}/lib/udev"
   ];
 
+  NIX_CFLAGS_COMPILE = [
+    # Default for release buildtype but passed manually because
+    # we're using plain
+    "-DG_DISABLE_CAST_CHECKS"
+  ];
+
   # So the polkit policy can reference /run/current-system/sw/bin/gnome-settings-daemon/gsd-backlight-helper
   postFixup = ''
     mkdir -p $out/bin/gnome-settings-daemon

pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix

@@ -150,6 +150,12 @@ stdenv.mkDerivation rec {
     "-Dudev_dir=${placeholder "out"}/lib/udev"
   ];
 
+  NIX_CFLAGS_COMPILE = [
+    # Default for release buildtype but passed manually because
+    # we're using plain
+    "-DG_DISABLE_CAST_CHECKS"
+  ];
+
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = projectName;

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")
+  NIX_CFLAGS_COMPILE = [
-    ++ [ "-Wno-error=nonnull" ];
+    "-Wno-error=nonnull"
+    # Default for release buildtype but passed manually because
+    # we're using plain
+    "-DG_DISABLE_CAST_CHECKS"
+  ];
 
   postPatch = ''
     # substitute fix-gio-launch-desktop-path.patch

pkgs/development/libraries/gtk+/3.x.nix

@@ -77,6 +77,13 @@ stdenv.mkDerivation rec {
     "-Dtests=false"
   ];
 
+  # These are the defines that'd you'd get with --enable-debug=minimum (default).
+  # See: https://developer.gnome.org/gtk3/stable/gtk-building.html#extra-configuration-options
+  NIX_CFLAGS_COMPILE = [
+    "-DG_ENABLE_DEBUG"
+    "-DG_DISABLE_CAST_CHECKS"
+  ];
+
   postPatch = ''
     files=(
       build-aux/meson/post-install.py