summary refs log tree commit diff
diff options
context:
space:
mode:
authorBobby Rong <rjl931189261@126.com>2022-11-13 19:56:39 +0800
committerBobby Rong <rjl931189261@126.com>2022-11-13 20:00:48 +0800
commit8d9763d043a0f3cb6a2c57f1ebc6ee10f99a0174 (patch)
treee94295bd61afa87b2f4c017b9b094933275c01ec
parentaa3396dc3216d2e44e4dca26900afb494d4c59ea (diff)
downloadnixpkgs-8d9763d043a0f3cb6a2c57f1ebc6ee10f99a0174.tar
nixpkgs-8d9763d043a0f3cb6a2c57f1ebc6ee10f99a0174.tar.gz
nixpkgs-8d9763d043a0f3cb6a2c57f1ebc6ee10f99a0174.tar.bz2
nixpkgs-8d9763d043a0f3cb6a2c57f1ebc6ee10f99a0174.tar.lz
nixpkgs-8d9763d043a0f3cb6a2c57f1ebc6ee10f99a0174.tar.xz
nixpkgs-8d9763d043a0f3cb6a2c57f1ebc6ee10f99a0174.tar.zst
nixpkgs-8d9763d043a0f3cb6a2c57f1ebc6ee10f99a0174.zip
mate.caja-extensions: Fix wrong schema path
Some schema comes from the mate-desktop package:

- org.mate.applications-terminal
- org.mate.background
-rw-r--r--pkgs/desktops/mate/caja-extensions/default.nix2
-rw-r--r--pkgs/desktops/mate/caja-extensions/hardcode-gsettings.patch6
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix
index 89061b31d5f..1cbbd97cc48 100644
--- a/pkgs/desktops/mate/caja-extensions/default.nix
+++ b/pkgs/desktops/mate/caja-extensions/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     (substituteAll {
       src = ./hardcode-gsettings.patch;
       caja_gsetttings_path = glib.getSchemaPath mate.caja;
-      term_gsetttings_path = glib.getSchemaPath mate.mate-terminal;
+      desktop_gsetttings_path = glib.getSchemaPath mate.mate-desktop;
     })
   ];
 
diff --git a/pkgs/desktops/mate/caja-extensions/hardcode-gsettings.patch b/pkgs/desktops/mate/caja-extensions/hardcode-gsettings.patch
index 7b29bfe66ea..f37124963d0 100644
--- a/pkgs/desktops/mate/caja-extensions/hardcode-gsettings.patch
+++ b/pkgs/desktops/mate/caja-extensions/hardcode-gsettings.patch
@@ -74,7 +74,7 @@ index e14a9bf..691afab 100644
 +    GSettingsSchemaSource* schema_source;
 +    GSettingsSchema* schema;
 +
-+    schema_source = g_settings_schema_source_new_from_directory("@term_gsetttings_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_gsetttings_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,