JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
62a974bbbf
nixpkgs/nixos/modules/services/x11/window-managers/metacity.nix

37 lines
864 B
Nix
Raw Normal View History

Rewrite ‘with pkgs.lib’ -> ‘with lib’ Using pkgs.lib on the spine of module evaluation is problematic because the pkgs argument depends on the result of module evaluation. To prevent an infinite recursion, pkgs and some of the modules are evaluated twice, which is inefficient. Using ‘with lib’ prevents this problem.
2014-04-14 15:26:48 +01:00
{ config, lib, pkgs, ... }:
Update all legacy-style modules I.e., modules that use "require = [options]". Nowadays that should be written as { options = { ... }; config = { ... }; }; Also, use "imports" instead of "require" in places where we actually import another module.
2013-09-04 12:05:09 +01:00
Rewrite ‘with pkgs.lib’ -> ‘with lib’ Using pkgs.lib on the spine of module evaluation is problematic because the pkgs argument depends on the result of module evaluation. To prevent an infinite recursion, pkgs and some of the modules are evaluated twice, which is inefficient. Using ‘with lib’ prevents this problem.
2014-04-14 15:26:48 +01:00
with lib;
Split xserver upstart job into: - xserver configuration & job - display manager (slim) - window manager (compiz, kwm, metacity, twm, wmii, xmonad) - desktop manager (kde, gnome, xterm) Added features: - Add WM choice in slim (with F1) svn path=/nixos/branches/fix-style/; revision=13857
2009-01-25 15:49:08 +00:00
let
Update all legacy-style modules I.e., modules that use "require = [options]". Nowadays that should be written as { options = { ... }; config = { ... }; }; Also, use "imports" instead of "require" in places where we actually import another module.
2013-09-04 12:05:09 +01:00
Split xserver upstart job into: - xserver configuration & job - display manager (slim) - window manager (compiz, kwm, metacity, twm, wmii, xmonad) - desktop manager (kde, gnome, xterm) Added features: - Add WM choice in slim (with F1) svn path=/nixos/branches/fix-style/; revision=13857
2009-01-25 15:49:08 +00:00
cfg = config.services.xserver.windowManager.metacity;
xorg = config.services.xserver.package;
gnome = pkgs.gnome;
Update all legacy-style modules I.e., modules that use "require = [options]". Nowadays that should be written as { options = { ... }; config = { ... }; }; Also, use "imports" instead of "require" in places where we actually import another module.
2013-09-04 12:05:09 +01:00
in
Split xserver upstart job into: - xserver configuration & job - display manager (slim) - window manager (compiz, kwm, metacity, twm, wmii, xmonad) - desktop manager (kde, gnome, xterm) Added features: - Add WM choice in slim (with F1) svn path=/nixos/branches/fix-style/; revision=13857
2009-01-25 15:49:08 +00:00
Update all legacy-style modules I.e., modules that use "require = [options]". Nowadays that should be written as { options = { ... }; config = { ... }; }; Also, use "imports" instead of "require" in places where we actually import another module.
2013-09-04 12:05:09 +01:00
{
options = {
Getting rid of mkOption in NixOS window manager modules Now the default way to define NixOS window manager modules is to use mkEnableOption to describe the module itself. In this commit, all files on nixos/modules/services/x11/window-managers are changed.
2015-12-04 09:38:23 +00:00
services.xserver.windowManager.metacity.enable = mkEnableOption "metacity";
Update all legacy-style modules I.e., modules that use "require = [options]". Nowadays that should be written as { options = { ... }; config = { ... }; }; Also, use "imports" instead of "require" in places where we actually import another module.
2013-09-04 12:05:09 +01:00
};
Split xserver upstart job into: - xserver configuration & job - display manager (slim) - window manager (compiz, kwm, metacity, twm, wmii, xmonad) - desktop manager (kde, gnome, xterm) Added features: - Add WM choice in slim (with F1) svn path=/nixos/branches/fix-style/; revision=13857
2009-01-25 15:49:08 +00:00
Update all legacy-style modules I.e., modules that use "require = [options]". Nowadays that should be written as { options = { ... }; config = { ... }; }; Also, use "imports" instead of "require" in places where we actually import another module.
2013-09-04 12:05:09 +01:00
config = mkIf cfg.enable {
services.xserver.windowManager.session = singleton
{ name = "metacity";
start = ''
treewide: Use makeLibraryPath in LD_LIBRARY_PATHs
2016-08-22 22:14:00 +01:00
env LD_LIBRARY_PATH=${lib.makeLibraryPath [ xorg.libX11 xorg.libXext ]}:/usr/lib/
Update all legacy-style modules I.e., modules that use "require = [options]". Nowadays that should be written as { options = { ... }; config = { ... }; }; Also, use "imports" instead of "require" in places where we actually import another module.
2013-09-04 12:05:09 +01:00
# !!! Hack: load the schemas for Metacity.
treewide: Fix output references to gnome.GConf
2016-08-23 02:34:18 +01:00
GCONF_CONFIG_SOURCE=xml::~/.gconf ${gnome.GConf.out}/bin/gconftool-2 \
Update all legacy-style modules I.e., modules that use "require = [options]". Nowadays that should be written as { options = { ... }; config = { ... }; }; Also, use "imports" instead of "require" in places where we actually import another module.
2013-09-04 12:05:09 +01:00
--makefile-install-rule ${gnome.metacity}/etc/gconf/schemas/*.schemas # */
${gnome.metacity}/bin/metacity &
waitPID=$!
'';
Split xserver upstart job into: - xserver configuration & job - display manager (slim) - window manager (compiz, kwm, metacity, twm, wmii, xmonad) - desktop manager (kde, gnome, xterm) Added features: - Add WM choice in slim (with F1) svn path=/nixos/branches/fix-style/; revision=13857
2009-01-25 15:49:08 +00:00
};
Update all legacy-style modules I.e., modules that use "require = [options]". Nowadays that should be written as { options = { ... }; config = { ... }; }; Also, use "imports" instead of "require" in places where we actually import another module.
2013-09-04 12:05:09 +01:00
environment.systemPackages = [ gnome.metacity ];
Split xserver upstart job into: - xserver configuration & job - display manager (slim) - window manager (compiz, kwm, metacity, twm, wmii, xmonad) - desktop manager (kde, gnome, xterm) Added features: - Add WM choice in slim (with F1) svn path=/nixos/branches/fix-style/; revision=13857
2009-01-25 15:49:08 +00:00
};
Update all legacy-style modules I.e., modules that use "require = [options]". Nowadays that should be written as { options = { ... }; config = { ... }; }; Also, use "imports" instead of "require" in places where we actually import another module.
2013-09-04 12:05:09 +01:00
Split xserver upstart job into: - xserver configuration & job - display manager (slim) - window manager (compiz, kwm, metacity, twm, wmii, xmonad) - desktop manager (kde, gnome, xterm) Added features: - Add WM choice in slim (with F1) svn path=/nixos/branches/fix-style/; revision=13857
2009-01-25 15:49:08 +00:00
}
Reference in New Issue Copy Permalink