diff options
| author | worldofpeace <worldofpeace@users.noreply.github.com> | 2019-04-16 20:38:26 -0400 |
|---|---|---|
| committer | worldofpeace <worldofpeace@users.noreply.github.com> | 2019-04-17 13:39:23 -0400 |
| commit | 7abeda982a0d4324d06a0997deb3681c91df55ff (patch) | |
| tree | 096fab32a6d2ddf31624c2e91cb0810412a3d9d1 /nixos | |
| parent | 25ebfe22e901017fe863a0a8ea824c790dbce125 (diff) | |
| download | nixpkgs-7abeda982a0d4324d06a0997deb3681c91df55ff.tar nixpkgs-7abeda982a0d4324d06a0997deb3681c91df55ff.tar.gz nixpkgs-7abeda982a0d4324d06a0997deb3681c91df55ff.tar.bz2 nixpkgs-7abeda982a0d4324d06a0997deb3681c91df55ff.tar.lz nixpkgs-7abeda982a0d4324d06a0997deb3681c91df55ff.tar.xz nixpkgs-7abeda982a0d4324d06a0997deb3681c91df55ff.tar.zst nixpkgs-7abeda982a0d4324d06a0997deb3681c91df55ff.zip | |
gnome3.gsettings-desktop-schemas -> gsettings-desktop-schemas
gnome3.pomodoro is left out because I don't want to create a conflict.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/programs/dconf.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/gnome3.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/programs/dconf.nix b/nixos/modules/programs/dconf.nix index 9c9765b06b6..b7bfb8504b6 100644 --- a/nixos/modules/programs/dconf.nix +++ b/nixos/modules/programs/dconf.nix @@ -38,7 +38,7 @@ in "${pkgs.gnome3.dconf.lib}/lib/gio/modules"; # https://github.com/NixOS/nixpkgs/pull/31891 #environment.variables.XDG_DATA_DIRS = optional cfg.enable - # "$(echo ${pkgs.gnome3.gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas-*)"; + # "$(echo ${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas-*)"; }; } diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 3d748d4308b..8f92d3d55c3 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -18,7 +18,7 @@ let nixos-gsettings-desktop-schemas = pkgs.runCommand "nixos-gsettings-desktop-schemas" { preferLocalBuild = true; } '' mkdir -p $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas - cp -rf ${pkgs.gnome3.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 + cp -rf ${pkgs.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 ${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") cfg.extraGSettingsOverridePackages} |