diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2022-09-26 00:26:22 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2022-09-26 00:52:08 +0200 |
commit | cb0c70b38855278096bfab28bcf2fcd69cc8b407 (patch) | |
tree | ae2c6c2459750f052060176332a2fc19ea36bc17 /pkgs/desktops | |
parent | 5e408af4de6cd0cc296467e2638db21360157df8 (diff) |
pantheon.elementary-gsettings-schemas: Bring closer to GNOME
- Prefer local builds to avoid costly copying. - Quote arguments. - Avoid `with` statements. - Use `concatMapStringsSep`. - Format with `nixpkgs-fmt` to fix indentation.
Diffstat (limited to 'pkgs/desktops')
-rw-r--r-- | pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix index dd6b10f5c830a..41c4c099cf2d9 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix @@ -10,11 +10,13 @@ , elementary-dock , gsettings-desktop-schemas , extraGSettingsOverrides ? "" -, extraGSettingsOverridePackages ? [] +, extraGSettingsOverridePackages ? [ ] }: let + inherit (lib) concatMapStringsSep; + gsettingsOverridePackages = [ elementary-dock gnome-settings-daemon @@ -27,25 +29,24 @@ let in -with lib; # TODO: Having https://github.com/NixOS/nixpkgs/issues/54150 would supersede this -runCommand "elementary-gsettings-desktop-schemas" {} +runCommand "elementary-gsettings-desktop-schemas" { preferLocalBuild = true; } '' - schema_dir=$out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas - - mkdir -p $schema_dir + data_dir="$out/share/gsettings-schemas/nixos-gsettings-overrides" + schema_dir="$data_dir/glib-2.0/schemas" - cp -rf ${glib.getSchemaPath gala}/*.gschema.override $schema_dir + mkdir -p "$schema_dir" + cp -rf "${glib.getSchemaPath gala}"/*.gschema.override "$schema_dir" - ${concatMapStrings (pkg: "cp -rf ${glib.getSchemaPath pkg}/*.xml $schema_dir\n") gsettingsOverridePackages} + ${concatMapStringsSep "\n" (pkg: "cp -rf \"${glib.getSchemaPath pkg}\"/*.xml \"$schema_dir\"") gsettingsOverridePackages} - chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides - cp ${glib.getSchemaPath elementary-default-settings}/* $schema_dir + chmod -R a+w "$data_dir" + cp "${glib.getSchemaPath elementary-default-settings}"/* "$schema_dir" - cat - > $schema_dir/nixos-defaults.gschema.override <<- EOF - ${extraGSettingsOverrides} - EOF + cat - > "$schema_dir/nixos-defaults.gschema.override" <<- EOF + ${extraGSettingsOverrides} + EOF - ${glib.dev}/bin/glib-compile-schemas $schema_dir + ${glib.dev}/bin/glib-compile-schemas $schema_dir '' |