b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

mate.caja-extensions: Fix failed substitution

Browse source 
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".
This commit is contained in:
Bobby Rong 2022-11-13 19:37:21 +08:00
parent 5f588eb4a9
commit aa3396dc32
No known key found for this signature in database
2 changed files with 5 additions and 5 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;
term_gsetttings_path = glib.getSchemaPath mate.mate-terminal;
})
];

6
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("@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,