From c81571ad8aaf504da19bc2dcf14cb9870ba2c9ca Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 24 Dec 2024 00:56:50 +0800 Subject: [PATCH 1/5] budgie-screensaver: Fix GCC 14 build https://hydra.nixos.org/build/282164464/nixlog/3 --- pkgs/by-name/bu/budgie-screensaver/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/bu/budgie-screensaver/package.nix b/pkgs/by-name/bu/budgie-screensaver/package.nix index 339b800800f4..4a87fdaeca49 100644 --- a/pkgs/by-name/bu/budgie-screensaver/package.nix +++ b/pkgs/by-name/bu/budgie-screensaver/package.nix @@ -56,7 +56,9 @@ stdenv.mkDerivation (finalAttrs: { xorg.libXxf86vm ]; - env.NIX_CFLAGS_COMPILE = "-D_POSIX_C_SOURCE"; + # Fix GCC 14 build. + # https://hydra.nixos.org/build/282164464/nixlog/3 + env.NIX_CFLAGS_COMPILE = "-D_POSIX_C_SOURCE -Wno-implicit-function-declaration"; passthru = { tests.version = testers.testVersion { From df40c21c9bb10fd80dcb1bc4055780a27d4e735d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 24 Dec 2024 01:09:20 +0800 Subject: [PATCH 2/5] cheese: Fix GCC 14 build --- pkgs/by-name/bu/budgie-screensaver/package.nix | 2 +- pkgs/by-name/ch/cheese/package.nix | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/bu/budgie-screensaver/package.nix b/pkgs/by-name/bu/budgie-screensaver/package.nix index 4a87fdaeca49..85aeef52ec9e 100644 --- a/pkgs/by-name/bu/budgie-screensaver/package.nix +++ b/pkgs/by-name/bu/budgie-screensaver/package.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { # Fix GCC 14 build. # https://hydra.nixos.org/build/282164464/nixlog/3 - env.NIX_CFLAGS_COMPILE = "-D_POSIX_C_SOURCE -Wno-implicit-function-declaration"; + env.NIX_CFLAGS_COMPILE = "-D_POSIX_C_SOURCE -Wno-error=implicit-function-declaration"; passthru = { tests.version = testers.testVersion { diff --git a/pkgs/by-name/ch/cheese/package.nix b/pkgs/by-name/ch/cheese/package.nix index 4da934e9d8eb..90cb870dd96a 100644 --- a/pkgs/by-name/ch/cheese/package.nix +++ b/pkgs/by-name/ch/cheese/package.nix @@ -95,6 +95,11 @@ stdenv.mkDerivation rec { ) ''; + # Fix GCC 14 build + # ../libcheese/cheese-flash.c:135:22: error: assignment to 'GtkWidget *' {aka 'struct _GtkWidget *'} from + # incompatible pointer type 'GObject *' {aka 'struct _GObject *'} [-Wincompatible-pointer-types] + env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + passthru = { updateScript = gnome.updateScript { packageName = "cheese"; From e774cd81765da01ddfd9b6cd439cfd2f87c358eb Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 24 Dec 2024 01:11:56 +0800 Subject: [PATCH 3/5] magpie: libgbm -> mesa ref: 656cab83ce77eb5a391bd80ea3bd8cc735079ae1 ref: 8b65c67d9b97c5d69107f490c0ca113cefe1ce40 --- pkgs/by-name/ma/magpie/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/magpie/package.nix b/pkgs/by-name/ma/magpie/package.nix index b5893def7984..65ff728acba0 100644 --- a/pkgs/by-name/ma/magpie/package.nix +++ b/pkgs/by-name/ma/magpie/package.nix @@ -32,7 +32,7 @@ pipewire, libgudev, libwacom, - libgbm, + mesa, meson, nix-update-script, validatePkgConfig, @@ -86,13 +86,13 @@ stdenv.mkDerivation (finalAttrs: { libXtst libcap_ng graphene + mesa # actually uses eglmesaext ]; nativeBuildInputs = [ desktop-file-utils gettext libxcvt - libgbm meson ninja xvfb-run From f2463f9cb02c2652b2df815ce8ec6d7fc12bdcca Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 24 Dec 2024 01:18:48 +0800 Subject: [PATCH 4/5] cheese: Propagate gstreamer For lib/pkgconfig/cheese.pc (e.g. try building budgie-control-center). --- pkgs/by-name/ch/cheese/package.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ch/cheese/package.nix b/pkgs/by-name/ch/cheese/package.nix index 90cb870dd96a..e1113fbebe08 100644 --- a/pkgs/by-name/ch/cheese/package.nix +++ b/pkgs/by-name/ch/cheese/package.nix @@ -67,22 +67,25 @@ stdenv.mkDerivation rec { buildInputs = [ adwaita-icon-theme clutter-gst - clutter-gtk dbus - gdk-pixbuf - glib gnome-desktop gnome-video-effects gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good - gst_all_1.gstreamer gtk3 libcanberra-gtk3 librsvg pipewire # PipeWire provides a gstreamer plugin for using PipeWire for video ]; + propagatedBuildInputs = [ + clutter-gtk + gdk-pixbuf + glib + gst_all_1.gstreamer + ]; + preFixup = '' gappsWrapperArgs+=( # Effects From e0949be93021d06c1950ab5eb3b32654a88134e5 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 24 Dec 2024 01:24:09 +0800 Subject: [PATCH 5/5] budgie-control-center: Fix GCC 14 build Also explicitly add gstreamer as a direct dependency. --- pkgs/by-name/bu/budgie-control-center/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/bu/budgie-control-center/package.nix b/pkgs/by-name/bu/budgie-control-center/package.nix index ca114fb1f6ff..622d46eafa83 100644 --- a/pkgs/by-name/bu/budgie-control-center/package.nix +++ b/pkgs/by-name/bu/budgie-control-center/package.nix @@ -21,6 +21,7 @@ glib-networking, glibc, gnome, + gst_all_1, gnome-bluetooth_1_0, gnome-color-manager, gnome-desktop, @@ -117,6 +118,7 @@ stdenv.mkDerivation (finalAttrs: { glib glib-networking gnome-desktop + gst_all_1.gstreamer adwaita-icon-theme cheese gnome-bluetooth_1_0 @@ -183,6 +185,11 @@ stdenv.mkDerivation (finalAttrs: { separateDebugInfo = true; + # Fix GCC 14 build. + # cc-display-panel.c:962:41: error: passing argument 1 of 'gtk_widget_set_sensitive' + # from incompatible pointer type [-Wincompatible-pointer-types] + env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + passthru = { tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; updateScript = nix-update-script { };