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 { }; diff --git a/pkgs/by-name/bu/budgie-screensaver/package.nix b/pkgs/by-name/bu/budgie-screensaver/package.nix index 339b800800f4..85aeef52ec9e 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-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..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 @@ -95,6 +98,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"; 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