diff options
| author | Bobby Rong <rjl931189261@126.com> | 2022-11-13 19:37:21 +0800 |
|---|---|---|
| committer | Bobby Rong <rjl931189261@126.com> | 2022-11-13 19:55:41 +0800 |
| commit | aa3396dc3216d2e44e4dca26900afb494d4c59ea (patch) | |
| tree | 6fce5383601abc80740b6457797ac9349f6edb70 | |
| parent | 5f588eb4a958f1a526ed8da02d6ea1bea0047b9f (diff) | |
| download | nixpkgs-aa3396dc3216d2e44e4dca26900afb494d4c59ea.tar nixpkgs-aa3396dc3216d2e44e4dca26900afb494d4c59ea.tar.gz nixpkgs-aa3396dc3216d2e44e4dca26900afb494d4c59ea.tar.bz2 nixpkgs-aa3396dc3216d2e44e4dca26900afb494d4c59ea.tar.lz nixpkgs-aa3396dc3216d2e44e4dca26900afb494d4c59ea.tar.xz nixpkgs-aa3396dc3216d2e44e4dca26900afb494d4c59ea.tar.zst nixpkgs-aa3396dc3216d2e44e4dca26900afb494d4c59ea.zip | |
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".
| -rw-r--r-- | pkgs/desktops/mate/caja-extensions/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/desktops/mate/caja-extensions/hardcode-gsettings.patch | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix index c099c18418f..89061b31d5f 100644 --- a/pkgs/desktops/mate/caja-extensions/default.nix +++ b/pkgs/desktops/mate/caja-extensions/default.nix @@ -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; }) ]; diff --git a/pkgs/desktops/mate/caja-extensions/hardcode-gsettings.patch b/pkgs/desktops/mate/caja-extensions/hardcode-gsettings.patch index d4cf5a44d1f..7b29bfe66ea 100644 --- a/pkgs/desktops/mate/caja-extensions/hardcode-gsettings.patch +++ b/pkgs/desktops/mate/caja-extensions/hardcode-gsettings.patch @@ -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, |