BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #201020 from bobby285271/caja

Browse source 
mate.caja-extensions: Fix some crash caused by schema path
This commit is contained in:
Bobby Rong 2022-11-15 16:03:04 +08:00 committed by GitHub
commit 27fc0153ad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/desktops/mate/caja-extensions/default.nix
View file

@ -39,8 +39,8 @@ stdenv.mkDerivation rec {
patches = [
(substituteAll {
src = ./hardcode-gsettings.patch;
CAJA_GSETTINGS_PATH = glib.getSchemaPath mate.caja;
TERM_GSETTINGS_PATH = glib.getSchemaPath mate.mate-terminal;
caja_gsetttings_path = glib.getSchemaPath mate.caja;
desktop_gsetttings_path = glib.getSchemaPath mate.mate-desktop;
})
];

8
pkgs/desktops/mate/caja-extensions/hardcode-gsettings.patch
View file

@ -53,7 +53,7 @@ index e14a9bf..691afab 100644
+ GSettingsSchemaSource* schema_source;
+ GSettingsSchema* schema;
+
+ schema_source = g_settings_schema_source_new_from_directory("@CAJA_GSETTINGS_PATH@",
+ schema_source = g_settings_schema_source_new_from_directory("@caja_gsetttings_path@",
+ g_settings_schema_source_get_default(),
+ TRUE, NULL);
+ schema = g_settings_schema_source_lookup(schema_source,
@ -74,7 +74,7 @@ index e14a9bf..691afab 100644
+ GSettingsSchemaSource* schema_source;
+ GSettingsSchema* schema;
+
+ schema_source = g_settings_schema_source_new_from_directory("@TERM_GSETTINGS_PATH@",
+ schema_source = g_settings_schema_source_new_from_directory("@desktop_gsetttings_path@",
+ g_settings_schema_source_get_default(),
+ TRUE, NULL);
+ schema = g_settings_schema_source_lookup(schema_source,
@ -95,7 +95,7 @@ index e14a9bf..691afab 100644
+ GSettingsSchemaSource* schema_source;
+ GSettingsSchema* schema;
+
+ schema_source = g_settings_schema_source_new_from_directory("@TERM_GSETTINGS_PATH@",
+ schema_source = g_settings_schema_source_new_from_directory("@desktop_gsetttings_path@",
+ g_settings_schema_source_get_default(),
+ TRUE, NULL);
+ schema = g_settings_schema_source_lookup(schema_source,
@ -155,7 +155,7 @@ index 3119e9f..4f80c88 100644
filename = g_filename_from_uri(uri, NULL, NULL);
- settings = g_settings_new (WP_SCHEMA);
+ schema_source = g_settings_schema_source_new_from_directory("@GSETTINGS_PATH@",
+ schema_source = g_settings_schema_source_new_from_directory("@desktop_gsetttings_path@",
+ g_settings_schema_source_get_default(),
+ TRUE, NULL);
+ schema = g_settings_schema_source_lookup(schema_source,