movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00
Code Activity

Small correction to xserver.nix for compiz; also nixos-checkout now creates services where it should be.

Browse source 
svn path=/nixos/trunk/; revision=9578
This commit is contained in:
Michael Raskin 2007-11-05 08:33:12 +00:00
parent 79c7f2cecc
commit b494c20cb5
3 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
installer/nixos-checkout.sh
View file

@ -21,14 +21,15 @@ if test -e nixpkgs -a ! -e nixpkgs/.svn; then
mv nixpkgs nixpkgs-$backupTimestamp mv nixpkgs nixpkgs-$backupTimestamp
fi fi
if test -e nixos/services -a ! -e nixos/services/.svn; then if test -e services -a ! -e services/.svn; then
mv nixos/services services-$backupTimestamp mv nixos/services services-$backupTimestamp
fi fi
# Check out the NixOS and Nixpkgs sources. # Check out the NixOS and Nixpkgs sources.
svn co https://svn.cs.uu.nl:12443/repos/trace/nixos/trunk nixos svn co https://svn.cs.uu.nl:12443/repos/trace/nixos/trunk nixos
svn co https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk nixpkgs svn co https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk nixpkgs
svn co https://svn.cs.uu.nl:12443/repos/trace/services/trunk nixos/services svn co https://svn.cs.uu.nl:12443/repos/trace/services/trunk services
ln -sf services nixos/services
# A few symlink. # A few symlink.
ln -sfn ../nixpkgs/pkgs nixos/pkgs ln -sfn ../nixpkgs/pkgs nixos/pkgs

8
system/options.nix
View file

@ -650,6 +650,14 @@
"; ";
} }
{
name = ["services" "xserver" "renderingFlag"];
default = "";
example = "--indirect-rendering";
description = "
Possibly pass --indierct-rendering to Compiz.
";
}
{ {
name = ["services" "xserver" "sessionStarter"]; name = ["services" "xserver" "sessionStarter"];

3
upstart-jobs/xserver.nix
View file

@ -38,6 +38,7 @@ let
resolutions = map (res: "\"${toString res.x}x${toString res.y}\"") (getCfg "resolutions"); resolutions = map (res: "\"${toString res.x}x${toString res.y}\"") (getCfg "resolutions");
sessionType = getCfg "sessionType"; sessionType = getCfg "sessionType";
sessionStarter = getCfg "sessionStarter"; sessionStarter = getCfg "sessionStarter";
renderingFlag = getCfg "renderingFlag";
sessionCmd = sessionCmd =
@ -238,7 +239,7 @@ let
# Start Compiz and the GTK-style window decorator. # Start Compiz and the GTK-style window decorator.
env LD_LIBRARY_PATH=${libX11}/lib:${libXext}/lib:/usr/lib/ env LD_LIBRARY_PATH=${libX11}/lib:${libXext}/lib:/usr/lib/
${compiz}/bin/compiz gconf & ${compiz}/bin/compiz gconf ${renderingFlag}&
${compiz}/bin/gtk-window-decorator --sync & ${compiz}/bin/gtk-window-decorator --sync &
" "
#else if windowManager == "beryl" then " #else if windowManager == "beryl" then "