Merge master into staging-next

1 files changed, 8 insertions, 5 deletions

diff --git a/pkgs/desktops/xfce/applications/mousepad/default.nix b/pkgs/desktops/xfce/applications/mousepad/default.nix
index 22fdd00cb2f03..33666c53bb802 100644
--- a/pkgs/desktops/xfce/applications/mousepad/default.nix
+++ b/pkgs/desktops/xfce/applications/mousepad/default.nix
@@ -1,16 +1,19 @@
-{ mkXfceDerivation, gobject-introspection, vala, gtk3, gtksourceview4, xfconf }:
+{ mkXfceDerivation, gobject-introspection, gtk3, gtksourceview4, gspell }:
 
 mkXfceDerivation {
   category = "apps";
   pname = "mousepad";
-  version = "0.5.4";
+  version = "0.5.5";
   odd-unstable = false;
 
-  sha256 = "0yrmjs6cyzm08jz8wzrx8wdxj7zdbxn6x625109ckfcfxrkp4a2f";
+  sha256 = "1c985xb3395bn1024qhqqdnlkbn02zldsnybxsw49xqh55pa4a2n";
 
-  nativeBuildInputs = [ gobject-introspection vala ];
+  nativeBuildInputs = [ gobject-introspection ];
 
-  buildInputs = [ gtk3 gtksourceview4 xfconf ];
+  buildInputs = [ gtk3 gtksourceview4 gspell ];
+
+  # Use the GSettings keyfile backend rather than DConf
+  configureFlags = [ "--enable-keyfile-settings" ];
 
   meta = {
     description = "Simple text editor for Xfce";