From 84f94cd186ed27912534845b8a0142e576a679ab Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 28 Dec 2024 16:05:49 +0000 Subject: [PATCH] gnome2.ORBit2: fix the build against `gcc-14` Without the change the build fails as https://hydra.nixos.org/build/282732612: configure: error: Linking is badly borked on your system. Please ensure your library path is correct Check config.log for details - check near the end of the log above 'failed program was' It happens because `gcc-14` defaults to `-Werror=implicit-int`. There is no easy way to jst regenerate `./configure` as it is not compatible with `automake-1.13` or above. Let' flip the `-Werror=` switches back before `gnome2.ORBit2` gets removed from `nixpkgs`. Closes: https://github.com/NixOS/nixpkgs/issues/367694 --- pkgs/desktops/gnome-2/platform/ORBit2/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix index 566767d2fc40..6c769138a1f6 100644 --- a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix +++ b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix @@ -38,6 +38,15 @@ stdenv.mkDerivation rec { "dev" ]; + env.NIX_CFLAGS_COMPILE = toString ( + lib.optionals (stdenv.cc.isGNU && (lib.versionAtLeast (lib.getVersion stdenv.cc.cc) "14")) [ + # the ./configure script is not compatible with gcc-14, not easy to + # regenerate without porting: https://github.com/NixOS/nixpkgs/issues/367694 + "-Wno-error=implicit-int" + "-Wno-error=incompatible-pointer-types" + ] + ); + configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "--with-idl-compiler=${lib.getExe' buildPackages.gnome2.ORBit2 "orbit-idl-2"}" # https://github.com/void-linux/void-packages/blob/e5856e02aa6ef7e4f2725afbff2915f89d39024b/srcpkgs/ORBit2/template#L17-L35