public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added checking of unkonwn options in configuration.nix and a system-wide font set changer.

Browse Source 
svn path=/nixos/trunk/; revision=9370
This commit is contained in:
Michael Raskin 2007-09-25 19:00:20 +00:00
parent 07fd13f20e
commit 51626b0b66
5 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/default.nix
View File

@ -120,7 +120,7 @@ import ../helpers/make-etc.nix {
++ (optional ["fonts" "enableFontConfig"] { ++ (optional ["fonts" "enableFontConfig"] {
source = pkgs.runCommand "fonts.conf" source = pkgs.runCommand "fonts.conf"
{ {
fontDirectories = import ../system/fonts.nix {inherit pkgs;}; fontDirectories = import ../system/fonts.nix {inherit pkgs config;};
buildInputs = [pkgs.libxslt]; buildInputs = [pkgs.libxslt];
inherit (pkgs) fontconfig; inherit (pkgs) fontconfig;
} }

6
system/fonts.nix
View File

@ -1,4 +1,4 @@
{pkgs}: {pkgs , config}:
[ [
# - the user's .fonts directory # - the user's .fonts directory
@ -18,4 +18,6 @@
pkgs.xorg.fontbh100dpi pkgs.xorg.fontbh100dpi
pkgs.xorg.fontmiscmisc pkgs.xorg.fontmiscmisc
pkgs.xorg.fontcursormisc pkgs.xorg.fontcursormisc
] ] ++
((config.get ["fonts" "extraFonts"]) pkgs)

9
system/options.nix
View File

@ -1118,6 +1118,15 @@ root ALL=(ALL) SETENV: ALL
"; ";
} }
{
name = ["fonts" "extraFonts"];
default = pkgs:[];
description = "
Function, returning list of additional fonts.
";
}
{ {
name = ["sound" "enable"]; name = ["sound" "enable"];

7
system/system.nix
View File

@ -309,7 +309,7 @@ rec {
# kernel, the Upstart services, the init scripts, etc.) as well as a # kernel, the Upstart services, the init scripts, etc.) as well as a
# script `switch-to-configuration' that activates the configuration # script `switch-to-configuration' that activates the configuration
# and makes it bootable. # and makes it bootable.
system = pkgs.stdenv.mkDerivation { system = pkgs.checker (pkgs.stdenv.mkDerivation {
name = "system"; name = "system";
builder = ./system.sh; builder = ./system.sh;
switchToConfiguration = ./switch-to-configuration.sh; switchToConfiguration = ./switch-to-configuration.sh;
@ -335,7 +335,6 @@ rec {
pkgs.upstart # for initctl pkgs.upstart # for initctl
]; ];
configurationName = config.get ["boot" "configurationName"]; configurationName = config.get ["boot" "configurationName"];
}; }) (pkgs.getConfig ["checkConfigurationOptions"] false)
config.declarations configuration ;
} }

2
upstart-jobs/default.nix
View File

@ -161,7 +161,7 @@ import ../upstart-jobs/gather.nix {
openssh x11_ssh_askpass nvidiaDrivers synaptics; openssh x11_ssh_askpass nvidiaDrivers synaptics;
libX11 = pkgs.xlibs.libX11; libX11 = pkgs.xlibs.libX11;
libXext = pkgs.xlibs.libXext; libXext = pkgs.xlibs.libXext;
fontDirectories = import ../system/fonts.nix {inherit pkgs;}; fontDirectories = import ../system/fonts.nix {inherit pkgs config;};
isClone = config.get ["services" "xserver" "isClone"]; isClone = config.get ["services" "xserver" "isClone"];
}) })