diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-04-24 18:38:11 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-04-24 18:38:11 +0200 |
| commit | 0a7bcb3b039ac79d8536249bb5cfc12a2b1d2b4f (patch) | |
| tree | 8ec471ccb384b4cea1b992c854c646305bb1bc2a /nixos | |
| parent | 85d3d95c9252ecb44ed0f0d246cd8612ca73241c (diff) | |
| parent | e71f7983fc496210814ab1257c59c00d411f55a2 (diff) | |
| download | nixpkgs-0a7bcb3b039ac79d8536249bb5cfc12a2b1d2b4f.tar nixpkgs-0a7bcb3b039ac79d8536249bb5cfc12a2b1d2b4f.tar.gz nixpkgs-0a7bcb3b039ac79d8536249bb5cfc12a2b1d2b4f.tar.bz2 nixpkgs-0a7bcb3b039ac79d8536249bb5cfc12a2b1d2b4f.tar.lz nixpkgs-0a7bcb3b039ac79d8536249bb5cfc12a2b1d2b4f.tar.xz nixpkgs-0a7bcb3b039ac79d8536249bb5cfc12a2b1d2b4f.tar.zst nixpkgs-0a7bcb3b039ac79d8536249bb5cfc12a2b1d2b4f.zip | |
Merge staging into staging-next
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 9bf03a49470..7b65f1b85c6 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} |