Unverified Commit aa3396dc authored by Bobby Rong's avatar Bobby Rong
Browse files

mate.caja-extensions: Fix failed substitution 

By simply adding cp -r ./ $out to postInstall, you will find the previous
substitution does not work at all, this is documented in Nixpkgs manual,
that for substituteAll, "Environment variables that start with an uppercase
letter or an underscore are filtered out".
parent 5f588eb4

pkgs/desktops/mate/caja-extensions/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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;

      term_gsetttings_path = glib.getSchemaPath mate.mate-terminal;

    })

  ];

pkgs/desktops/mate/caja-extensions/hardcode-gsettings.patch

+3 −3
Original line number Diff line number Diff line
@@ -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("@term_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("@term_gsetttings_path@",

+                                                                g_settings_schema_source_get_default(),

+                                                                TRUE, NULL);

+    schema = g_settings_schema_source_lookup(schema_source,