Fixed compiz_062
svn path=/nixpkgs/trunk/; revision=9582
This commit is contained in:
parent
fff1ba967e
commit
7b2aab3846
2 changed files with 5 additions and 16 deletions
|
@ -3441,20 +3441,9 @@ rec {
|
|||
inherit librsvg fuse;
|
||||
};
|
||||
|
||||
compiz_062 = assert mesaSupported; import ../applications/window-managers/compiz/0.6.2.nix {
|
||||
inherit lib builderDefs stringsWithDeps;
|
||||
inherit fetchurl stdenv pkgconfig libpng mesa perl perlXMLParser libxslt;
|
||||
inherit (xorg) libXcomposite libXfixes libXdamage libXrandr
|
||||
libXinerama libICE libSM libXrender xextproto;
|
||||
inherit (gnome) startupnotification libwnck GConf;
|
||||
inherit (gtkLibs) gtk;
|
||||
inherit (gnome) libgnome libgnomeui metacity
|
||||
glib pango libglade libgtkhtml gtkhtml
|
||||
libgnomecanvas libgnomeprint
|
||||
libgnomeprintui gnomepanel;
|
||||
gnomegtk = gnome.gtk;
|
||||
inherit librsvg fuse;
|
||||
};
|
||||
compiz_062 = compizFun {
|
||||
version = "0.6.2";
|
||||
};
|
||||
|
||||
compizFun = lib.sumArgs (assert mesaSupported; import ../applications/window-managers/compiz) {
|
||||
inherit lib builderDefs stringsWithDeps;
|
||||
|
|
|
@ -203,8 +203,8 @@ rec
|
|||
echo '${toString (getAttr ["propagatedBuildInputs"] [] args)}' >\$out/nix-support/propagated-build-inputs
|
||||
") [minInit defEnsureDir];
|
||||
|
||||
debug = x:(__trace x x);
|
||||
debugX = x:(__trace (__toXML x) x);
|
||||
/*debug = x:(__trace x x);
|
||||
debugX = x:(__trace (__toXML x) x);*/
|
||||
|
||||
replaceScriptVar = file: name: value: ("sed -e 's`^${name}=.*`${name}='\\''${value}'\\''`' -i ${file}");
|
||||
replaceInScript = file: l: (concatStringsSep "\n" ((pairMap (replaceScriptVar file) l)));
|
||||
|
|
Loading…
Reference in a new issue