From 3a056b3ff98d8c2826ec674ec4c81d8ddaa61b4c Mon Sep 17 00:00:00 2001 From: rewine Date: Fri, 27 Oct 2023 21:01:48 +0800 Subject: dde-gsettings-schemas: Bring closer to GNOME Same with https://github.com/NixOS/nixpkgs/commit/cb0c70b38855278096bfab28bcf2fcd69cc8b407 --- pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'pkgs/desktops/deepin') diff --git a/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix b/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix index 252baf515abe..a609d707a03c 100644 --- a/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix +++ b/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix @@ -33,17 +33,18 @@ in with lib; # TODO: Having https://github.com/NixOS/nixpkgs/issues/54150 would supersede this -runCommand "nixos-gsettings-desktop-schemas" { } - '' - schema_dir=$out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas +runCommand "nixos-gsettings-desktop-schemas" { preferLocalBuild = true; } +'' + data_dir="$out/share/gsettings-schemas/nixos-gsettings-overrides" + schema_dir="$data_dir/glib-2.0/schemas" mkdir -p $schema_dir - ${concatMapStrings (pkg: "cp -rvf ${glib.getSchemaPath pkg}/* $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 + chmod -R a+w "$data_dir" - cat - > $schema_dir/nixos-defaults.gschema.override <<- EOF + cat - > "$schema_dir/nixos-defaults.gschema.override" <<- EOF ${extraGSettingsOverrides} EOF -- cgit 1.4.1