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

Removed tabs in nix-expressions introduced by me in nixos/ tree.

Browse Source 
svn path=/nixos/trunk/; revision=12532
This commit is contained in:
Michael Raskin 2008-08-07 10:23:20 +00:00
parent 014b33637c
commit 2bcb5a8efe
2 changed files with 63 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
system/fontdir.nix
View File

@ -1,54 +1,54 @@
args : with args; with builderDefs {src="";} null; args : with args; with builderDefs {src="";} null;
let localDefs = builderDefs rec { let localDefs = builderDefs rec {
src = "";/* put a fetchurl here */ src = "";/* put a fetchurl here */
buildInputs = [mkfontdir mkfontscale ttmkfdir]; buildInputs = [mkfontdir mkfontscale ttmkfdir];
configureFlags = []; configureFlags = [];
fontDirs = import ./fonts.nix {inherit pkgs config;}; fontDirs = import ./fonts.nix {inherit pkgs config;};
installPhase = FullDepEntry (" installPhase = FullDepEntry ("
list=''; list='';
for i in ${toString fontDirs} ; do for i in ${toString fontDirs} ; do
if [ -d \$i/ ]; then if [ -d \$i/ ]; then
list=\"\$list \$i\"; list=\"\$list \$i\";
fi; fi;
done done
list=\$(find \$list -name fonts.dir); list=\$(find \$list -name fonts.dir);
fontDirs=''; fontDirs='';
for i in \$list ; do for i in \$list ; do
fontDirs=\"\$fontDirs \$(dirname \$i)\"; fontDirs=\"\$fontDirs \$(dirname \$i)\";
done; done;
mkdir -p \$out/share/X11-fonts/; mkdir -p \$out/share/X11-fonts/;
for i in \$(find \$fontDirs -type f -o -type l); do for i in \$(find \$fontDirs -type f -o -type l); do
j=\${i##*/} j=\${i##*/}
if ! test -e \$out/share/X11-fonts/\${j}; then if ! test -e \$out/share/X11-fonts/\${j}; then
ln -s \$i \$out/share/X11-fonts/\${j}; ln -s \$i \$out/share/X11-fonts/\${j};
fi; fi;
done; done;
cd \$out/share/X11-fonts/ cd \$out/share/X11-fonts/
rm fonts.dir rm fonts.dir
rm fonts.scale rm fonts.scale
rm fonts.alias rm fonts.alias
mkfontdir mkfontdir
mkfontscale mkfontscale
mv fonts.scale fonts.scale.old mv fonts.scale fonts.scale.old
mv fonts.dir fonts.dir.old mv fonts.dir fonts.dir.old
ttmkfdir ttmkfdir
cat fonts.scale.old >> fonts.scale cat fonts.scale.old >> fonts.scale
cat fonts.dir.old >> fonts.dir cat fonts.dir.old >> fonts.dir
rm fonts.dir.old rm fonts.dir.old
rm fonts.scale.old rm fonts.scale.old
cat \$( find ${fontalias}/ -name fonts.alias) >fonts.alias cat \$( find ${fontalias}/ -name fonts.alias) >fonts.alias
") ["minInit" "addInputs"]; ") ["minInit" "addInputs"];
} null; /* null is a terminator for sumArgs */ } null; /* null is a terminator for sumArgs */
in with localDefs; in with localDefs;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "X11-fonts"; name = "X11-fonts";
builder = writeScript (name + "-builder") builder = writeScript (name + "-builder")
(textClosure localDefs (textClosure localDefs
[installPhase doForceShare doPropagate]); [installPhase doForceShare doPropagate]);
meta = { meta = {
description = " description = "
Directory to contain all X11 fonts requested. Directory to contain all X11 fonts requested.
"; ";
}; };
} }

28
system/options.nix
View File

@ -653,10 +653,10 @@
allowEveryone = mkOption { allowEveryone = mkOption {
default = false; default = false;
description = '' description = ''
Whether to make /var/spool/at{jobs,spool} writeable Whether to make /var/spool/at{jobs,spool} writeable
by everyone (and sticky). by everyone (and sticky).
''; '';
}; };
}; };
@ -1487,7 +1487,7 @@
contextXML = mkOption { contextXML = mkOption {
default = ""; default = "";
description = "Location of the context.xml to use. Leave empty to use the default."; description = "Location of the context.xml to use. Leave empty to use the default.";
}; };
}; };
@ -1707,23 +1707,23 @@
writeEnable = mkOption { writeEnable = mkOption {
default = false; default = false;
description = " description = "
Whether any write activity is permitted to users. Whether any write activity is permitted to users.
"; ";
}; };
anonymousUploadEnable = mkOption { anonymousUploadEnable = mkOption {
default = false; default = false;
description = " description = "
Whether any uploads are permitted to anonymous users. Whether any uploads are permitted to anonymous users.
"; ";
}; };
anonymousMkdirEnable = mkOption { anonymousMkdirEnable = mkOption {
default = false; default = false;
description = " description = "
Whether mkdir is permitted to anonymous users. Whether mkdir is permitted to anonymous users.
"; ";
}; };
}; };