From 887adef31adcd61b461fe14ddc6c52128409939d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 28 Dec 2020 18:17:54 -0300 Subject: [PATCH] xfce.mousepad: 0.4.2 -> 0.5.3 --- ...arent-sources-when-looking-up-schema.patch | 25 +++++++++++++++++++ .../xfce/applications/mousepad/default.nix | 16 ++++++------ 2 files changed, 33 insertions(+), 8 deletions(-) create mode 100644 pkgs/desktops/xfce/applications/mousepad/allow-checking-parent-sources-when-looking-up-schema.patch diff --git a/pkgs/desktops/xfce/applications/mousepad/allow-checking-parent-sources-when-looking-up-schema.patch b/pkgs/desktops/xfce/applications/mousepad/allow-checking-parent-sources-when-looking-up-schema.patch new file mode 100644 index 00000000000..aa797bf42cf --- /dev/null +++ b/pkgs/desktops/xfce/applications/mousepad/allow-checking-parent-sources-when-looking-up-schema.patch @@ -0,0 +1,25 @@ +From 3b06d6129033ddaa8dc455a6a572077fd63a3816 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= +Date: Mon, 1 Mar 2021 17:03:07 -0300 +Subject: [PATCH] Allow checking parent sources when looking up schema + +--- + mousepad/mousepad-settings-store.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mousepad/mousepad-settings-store.c b/mousepad/mousepad-settings-store.c +index e5a848b..de989bd 100644 +--- a/mousepad/mousepad-settings-store.c ++++ b/mousepad/mousepad-settings-store.c +@@ -181,7 +181,7 @@ mousepad_settings_store_add_settings (MousepadSettingsStore *self, + const gchar *prefix; + + /* loop through keys in schema and store mapping of their setting name to GSettings */ +- schema = g_settings_schema_source_lookup (source, schema_id, FALSE); ++ schema = g_settings_schema_source_lookup (source, schema_id, TRUE); + keys = g_settings_schema_list_keys (schema); + prefix = schema_id + MOUSEPAD_ID_LEN + 1; + for (key = keys; key && *key; key++) +-- +2.30.0 + diff --git a/pkgs/desktops/xfce/applications/mousepad/default.nix b/pkgs/desktops/xfce/applications/mousepad/default.nix index 3c84f5558a1..eaac32bb5e3 100644 --- a/pkgs/desktops/xfce/applications/mousepad/default.nix +++ b/pkgs/desktops/xfce/applications/mousepad/default.nix @@ -1,20 +1,20 @@ -{ mkXfceDerivation, exo, glib, gtk3, gtksourceview3, xfconf }: +{ mkXfceDerivation, gobject-introspection, vala, gtk3, gtksourceview3, xfconf }: mkXfceDerivation { category = "apps"; pname = "mousepad"; - version = "0.4.2"; + version = "0.5.3"; odd-unstable = false; - sha256 = "0a35vaq4l0d8vzw7hqpvbgkr3wj1sqr2zvj7bc5z4ikz2cppqj7p"; + sha256 = "0ki5k5p24dpawkyq4k8am1fcq02njhnmhq5vf2ah1zqbc0iyl5yn"; - nativeBuildInputs = [ exo ]; - buildInputs = [ glib gtk3 gtksourceview3 xfconf ]; + nativeBuildInputs = [ gobject-introspection vala ]; - # See https://github.com/NixOS/nixpkgs/issues/36468 - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + buildInputs = [ gtk3 gtksourceview3 xfconf ]; + + patches = [ ./allow-checking-parent-sources-when-looking-up-schema.patch ]; meta = { - description = "A simple text editor for Xfce"; + description = "Simple text editor for Xfce"; }; }