From 88538e0d8529dedf96cf41054b05e5c0433b1824 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 23 Dec 2024 22:46:17 +0800 Subject: [PATCH 1/5] caribou: Fix GCC 14 build https://hydra.nixos.org/build/282444876/nixlog/1 --- pkgs/by-name/ca/caribou/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/ca/caribou/package.nix b/pkgs/by-name/ca/caribou/package.nix index 463fe2f7e281..5383cb72e973 100644 --- a/pkgs/by-name/ca/caribou/package.nix +++ b/pkgs/by-name/ca/caribou/package.nix @@ -91,6 +91,13 @@ stdenv.mkDerivation rec { substituteInPlace libcaribou/Makefile.am --replace "--shared-library=libcaribou.so.0" "--shared-library=$out/lib/libcaribou.so.0" ''; + env = lib.optionalAttrs stdenv.cc.isGNU { + # This really should be done by latest Vala, but we are using + # release tarball here, which dists generated C code. + # https://gitlab.gnome.org/GNOME/vala/-/merge_requests/369 + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + }; + passthru = { updateScript = gnome.updateScript { packageName = "caribou"; }; }; From 2f70db3e9429746fb2351c6183e6f04b146c04b4 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 23 Dec 2024 22:58:08 +0800 Subject: [PATCH 2/5] clutter-gst: Add missing gstreamer-* These are explicitly required to build this. https://gitlab.gnome.org/Archive/clutter-gst/-/blob/master/configure.ac https://hydra.nixos.org/build/282445316/nixlog/1 --- pkgs/development/libraries/clutter-gst/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix index 11cdf0b4f7fd..3f67e0ab6fb6 100644 --- a/pkgs/development/libraries/clutter-gst/default.nix +++ b/pkgs/development/libraries/clutter-gst/default.nix @@ -11,6 +11,7 @@ gnome, gdk-pixbuf, gobject-introspection, + gst_all_1, }: stdenv.mkDerivation rec { @@ -49,6 +50,8 @@ stdenv.mkDerivation rec { glib cogl gdk-pixbuf + gst_all_1.gstreamer + gst_all_1.gst-plugins-base ]; postBuild = "rm -rf $out/share/gtk-doc"; From b685ea0654cbd8114e5ef166b476fd0c21edc3ec Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 23 Dec 2024 23:00:43 +0800 Subject: [PATCH 3/5] xplayer: Fix GCC 14 build bacon-video-widget.c:1926:46: error: assignment to 'GstElement *' {aka 'struct _GstElement *'} from incompatible pointer type 'GstObject *' {aka 'struct _GstObject *'} [] --- pkgs/by-name/xp/xplayer/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/xp/xplayer/package.nix b/pkgs/by-name/xp/xplayer/package.nix index 42088cf6fd76..d17b1f05b197 100644 --- a/pkgs/by-name/xp/xplayer/package.nix +++ b/pkgs/by-name/xp/xplayer/package.nix @@ -86,6 +86,13 @@ stdenv.mkDerivation rec { patchPythonScript $out/lib/xplayer/plugins/dbus/dbusservice.py ''; + env = lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=incompatible-pointer-types" + "-Wno-error=return-mismatch" + ]; + }; + meta = with lib; { description = "Generic media player from Linux Mint"; license = with licenses; [ From 05f5f947b4feebfb6ea9ccb29e65bda8ef2aec2d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 23 Dec 2024 23:08:42 +0800 Subject: [PATCH 4/5] nixos/cinnamon: Replace xplayer with celluloid https://github.com/linuxmint/xplayer/issues/169#issuecomment-1072069928 --- nixos/doc/manual/release-notes/rl-2505.section.md | 1 + nixos/modules/services/x11/desktop-managers/cinnamon.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 9a0eb89d55db..db753bbdf4ae 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -241,6 +241,7 @@ - Cinnamon has been updated to 6.4, please check the [upstream announcement](https://www.linuxmint.com/rel_xia_whatsnew.php) for more details. - Following [changes in Mint 22](https://github.com/linuxmint/mintupgrade/commit/f239cde908288b8c250f938e7311c7ffbc16bd59) we are no longer overriding Qt application styles. You can still restore the previous default with `qt.style = "gtk2"` and `qt.platformTheme = "gtk2"`. + - Following [changes in Mint 20](https://github.com/linuxmint/mintupgrade-legacy/commit/ce15d946ed9a8cb8444abd25088edd824bfb18f6) we are replacing xplayer with celluloid since xplayer is no longer maintained. - Xfce has been updated to 4.20, please check the [upstream feature tour](https://www.xfce.org/about/tour420) for more details. - Wayland session is still [experimental](https://wiki.xfce.org/releng/wayland_roadmap) and requires opt-in using `enableWaylandSession` option. diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index 2abcd5033cd5..c64c2293a439 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -241,10 +241,10 @@ in xviewer xreader xed-editor - xplayer pix # external apps shipped with linux-mint + celluloid gnome-calculator gnome-calendar gnome-screenshot From f08e95b16f4ef9ec022ca691137766b57fa989df Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 23 Dec 2024 23:19:02 +0800 Subject: [PATCH 5/5] timeshift: Fix GCC 14 build TeeJee.Process.c:1134:9: error: implicit declaration of function 'kill' --- pkgs/applications/backup/timeshift/unwrapped.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/backup/timeshift/unwrapped.nix b/pkgs/applications/backup/timeshift/unwrapped.nix index 3fbaed4b21be..ebc37cfe55ff 100644 --- a/pkgs/applications/backup/timeshift/unwrapped.nix +++ b/pkgs/applications/backup/timeshift/unwrapped.nix @@ -57,6 +57,10 @@ stdenv.mkDerivation rec { xapp ]; + env = lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + meta = with lib; { description = "System restore tool for Linux"; longDescription = ''