diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-08-26 03:44:25 -0400 |
|---|---|---|
| committer | worldofpeace <worldofpeace@protonmail.ch> | 2019-08-26 21:28:17 -0400 |
| commit | 7bb8f05f12ca3cff9da72b56caa2f7472d5732bc (patch) | |
| tree | d82f5bd7927cf4d7171a6aba5a8c9e80962f45ca /pkgs/desktops/pantheon/desktop | |
| parent | ed2aa6313f6d42242ab174d2a0dd1a2e8bff5476 (diff) | |
| download | nixpkgs-7bb8f05f12ca3cff9da72b56caa2f7472d5732bc.tar nixpkgs-7bb8f05f12ca3cff9da72b56caa2f7472d5732bc.tar.gz nixpkgs-7bb8f05f12ca3cff9da72b56caa2f7472d5732bc.tar.bz2 nixpkgs-7bb8f05f12ca3cff9da72b56caa2f7472d5732bc.tar.lz nixpkgs-7bb8f05f12ca3cff9da72b56caa2f7472d5732bc.tar.xz nixpkgs-7bb8f05f12ca3cff9da72b56caa2f7472d5732bc.tar.zst nixpkgs-7bb8f05f12ca3cff9da72b56caa2f7472d5732bc.zip | |
treewide: use glib.{getSchemaPath, makeSchemaPath}
Diffstat (limited to 'pkgs/desktops/pantheon/desktop')
| -rw-r--r-- | pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix index dbcb992c425..b62fc637ec7 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix @@ -33,16 +33,17 @@ with stdenv.lib; # TODO: Having https://github.com/NixOS/nixpkgs/issues/54150 would supersede this runCommand "elementary-gsettings-desktop-schemas" {} '' - mkdir -p $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas - cp -rf ${gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas + schema_dir=$out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas - ${concatMapStrings (pkg: "cp -rf ${pkg}/share/gsettings-schemas/*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas\n") gsettingsOverridePackages} + mkdir -p $schema_dir + cp -rf ${glib.getSchemaPath gsettings-desktop-schemas}/*.xml $schema_dir + + ${concatMapStrings (pkg: "cp -rf ${glib.getSchemaPath pkg}/*.xml $schema_dir\n") gsettingsOverridePackages} chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides - cp ${elementary-default-settings}/share/glib-2.0/schemas/20-io.elementary.desktop.gschema.override \ - $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas + cp ${elementary-default-settings}/share/glib-2.0/schemas/20-io.elementary.desktop.gschema.override $schema_dir - cat - > $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/nixos-defaults.gschema.override <<- EOF + cat - > $schema_dir/nixos-defaults.gschema.override <<- EOF [org.gnome.desktop.background] picture-uri='${nixos-artwork.wallpapers.simple-dark-gray}/share/artwork/gnome/nix-wallpaper-simple-dark-gray.png' primary-color='#000000' @@ -50,5 +51,5 @@ runCommand "elementary-gsettings-desktop-schemas" {} ${extraGSettingsOverrides} EOF - ${glib.dev}/bin/glib-compile-schemas $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/ + ${glib.dev}/bin/glib-compile-schemas $schema_dir '' |