Skip to content

Commit 36f82b3

Browse files
authored
nixosTests.cinnamon: Fix build (#367668)
2 parents 0aa9c67 + f08e95b commit 36f82b3

File tree

6 files changed

+23
-1
lines changed

6 files changed

+23
-1
lines changed

nixos/doc/manual/release-notes/rl-2505.section.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,7 @@
241241

242242
- Cinnamon has been updated to 6.4, please check the [upstream announcement](https://www.linuxmint.com/rel_xia_whatsnew.php) for more details.
243243
- 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"`.
244+
- 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.
244245

245246
- Xfce has been updated to 4.20, please check the [upstream feature tour](https://www.xfce.org/about/tour420) for more details.
246247
- Wayland session is still [experimental](https://wiki.xfce.org/releng/wayland_roadmap) and requires opt-in using `enableWaylandSession` option.

nixos/modules/services/x11/desktop-managers/cinnamon.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,10 +241,10 @@ in
241241
xviewer
242242
xreader
243243
xed-editor
244-
xplayer
245244
pix
246245

247246
# external apps shipped with linux-mint
247+
celluloid
248248
gnome-calculator
249249
gnome-calendar
250250
gnome-screenshot

pkgs/applications/backup/timeshift/unwrapped.nix

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@ stdenv.mkDerivation rec {
5757
xapp
5858
];
5959

60+
env = lib.optionalAttrs stdenv.cc.isGNU {
61+
NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
62+
};
63+
6064
meta = with lib; {
6165
description = "System restore tool for Linux";
6266
longDescription = ''

pkgs/by-name/ca/caribou/package.nix

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,13 @@ stdenv.mkDerivation rec {
9191
substituteInPlace libcaribou/Makefile.am --replace "--shared-library=libcaribou.so.0" "--shared-library=$out/lib/libcaribou.so.0"
9292
'';
9393

94+
env = lib.optionalAttrs stdenv.cc.isGNU {
95+
# This really should be done by latest Vala, but we are using
96+
# release tarball here, which dists generated C code.
97+
# https://gitlab.gnome.org/GNOME/vala/-/merge_requests/369
98+
NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
99+
};
100+
94101
passthru = {
95102
updateScript = gnome.updateScript { packageName = "caribou"; };
96103
};

pkgs/by-name/xp/xplayer/package.nix

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,13 @@ stdenv.mkDerivation rec {
8686
patchPythonScript $out/lib/xplayer/plugins/dbus/dbusservice.py
8787
'';
8888

89+
env = lib.optionalAttrs stdenv.cc.isGNU {
90+
NIX_CFLAGS_COMPILE = toString [
91+
"-Wno-error=incompatible-pointer-types"
92+
"-Wno-error=return-mismatch"
93+
];
94+
};
95+
8996
meta = with lib; {
9097
description = "Generic media player from Linux Mint";
9198
license = with licenses; [

pkgs/development/libraries/clutter-gst/default.nix

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
gnome,
1212
gdk-pixbuf,
1313
gobject-introspection,
14+
gst_all_1,
1415
}:
1516

1617
stdenv.mkDerivation rec {
@@ -49,6 +50,8 @@ stdenv.mkDerivation rec {
4950
glib
5051
cogl
5152
gdk-pixbuf
53+
gst_all_1.gstreamer
54+
gst_all_1.gst-plugins-base
5255
];
5356

5457
postBuild = "rm -rf $out/share/gtk-doc";

0 commit comments

Comments
 (0)