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

* Tabs considered harmful.

Browse Source 
svn path=/nixos/trunk/; revision=12407
This commit is contained in:
Eelco Dolstra 2008-07-23 14:13:27 +00:00
parent cc902c638c
commit 5ec1fa2060
21 changed files with 530 additions and 531 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
system/system.nix
View File

@ -192,7 +192,7 @@ rec {
# Font aggregation # Font aggregation
fontDir = import ./fontdir.nix { fontDir = import ./fontdir.nix {
inherit config pkgs ; inherit config pkgs;
inherit (pkgs) builderDefs ttmkfdir; inherit (pkgs) builderDefs ttmkfdir;
inherit (pkgs.xorg) mkfontdir mkfontscale fontalias; inherit (pkgs.xorg) mkfontdir mkfontscale fontalias;
}; };
@ -330,7 +330,7 @@ rec {
bash = pkgs.bashInteractive; bash = pkgs.bashInteractive;
adjustSetuidOwner = pkgs.lib.concatStrings (map adjustSetuidOwner = pkgs.lib.concatStrings (map
(_entry:let entry = { (_entry: let entry = {
owner = "nobody"; owner = "nobody";
group = "nogroup"; group = "nogroup";
setuid = false; setuid = false;
@ -340,7 +340,6 @@ rec {
chown ${entry.owner}.${entry.group} $wrapperDir/${entry.program} chown ${entry.owner}.${entry.group} $wrapperDir/${entry.program}
chmod u${if entry.setuid then "+" else "-"}s $wrapperDir/${entry.program} chmod u${if entry.setuid then "+" else "-"}s $wrapperDir/${entry.program}
chmod g${if entry.setgid then "+" else "-"}s $wrapperDir/${entry.program} chmod g${if entry.setgid then "+" else "-"}s $wrapperDir/${entry.program}
'') '')
config.security.setuidOwners); config.security.setuidOwners);
}; };
@ -413,5 +412,5 @@ rec {
}) (pkgs.lib.getAttr ["environment" "checkConfigurationOptions"] }) (pkgs.lib.getAttr ["environment" "checkConfigurationOptions"]
optionDeclarations.environment.checkConfigurationOptions.default optionDeclarations.environment.checkConfigurationOptions.default
configuration) configuration)
optionDeclarations configuration ; optionDeclarations configuration;
} }

6
upstart-jobs/default.nix
View File

@ -349,9 +349,9 @@ let
(import ../upstart-jobs/dbus.nix { (import ../upstart-jobs/dbus.nix {
inherit (pkgs) stdenv dbus; inherit (pkgs) stdenv dbus;
dbusServices = dbusServices =
pkgs.lib.optional (config.services.hal.enable) pkgs.hal ++ pkgs.lib.optional config.services.hal.enable pkgs.hal ++
pkgs.lib.optional (config.services.avahi.enable) pkgs.avahi ++ pkgs.lib.optional config.services.avahi.enable pkgs.avahi ++
pkgs.lib.optional (config.services.disnix.enable) pkgs.disnix pkgs.lib.optional config.services.disnix.enable pkgs.disnix
; ;
}) })