Added compiz 0.6.2 . Made a stub to make version a simple passable string. Drawbacks: can also accept "extra" as compiz version; dirty hack for getting nabsolute path of ./ .
svn path=/nixpkgs/trunk/; revision=9575
This commit is contained in:
parent
f723c676b8
commit
4a70a11011
5 changed files with 109 additions and 34 deletions
33
pkgs/applications/window-managers/compiz/0.5.0.nix
Normal file
33
pkgs/applications/window-managers/compiz/0.5.0.nix
Normal file
|
@ -0,0 +1,33 @@
|
|||
/*{ stdenv, fetchurl, pkgconfig, libpng, libXcomposite, libXfixes
|
||||
, libXdamage, libXrandr, libXinerama, libICE, libSM
|
||||
, startupnotification, libXrender, xextproto, mesa, gtk, libwnck, GConf
|
||||
, libgnome, libgnomeui, metacity
|
||||
, gnomegtk, glib, pango, libglade, libgtkhtml, gtkhtml, libgnomecanvas, libgnomeprint, libgnomeprintui, gnomepanel
|
||||
, librsvg, fuse
|
||||
}:*/
|
||||
args: with args;
|
||||
stdenv.mkDerivation {
|
||||
name = "compiz-0.5.0";
|
||||
src = fetchurl {
|
||||
url = http://xorg.freedesktop.org/archive/individual/app/compiz-0.5.0.tar.gz;
|
||||
sha256 = "1fac5fc37b218k34lpxqlhs7srqxm7jly0hfncs3ghmjmxdlj03y";
|
||||
};
|
||||
patches = [
|
||||
./tfp-server-extension.patch
|
||||
];
|
||||
buildInputs = [
|
||||
pkgconfig libXrender xextproto gtk libwnck GConf libgnome libgnomeui metacity gnomegtk glib pango libglade libgtkhtml gtkhtml libgnomecanvas libgnomeprint libgnomeprintui gnomepanel librsvg fuse
|
||||
];
|
||||
propagatedBuildInputs = [
|
||||
libpng libXcomposite libXfixes libXdamage libXrandr libXinerama
|
||||
libICE libSM startupnotification mesa GConf
|
||||
];
|
||||
configureFlags = "--enable-gtk --enable-fuse --enable-annotate --enable-librsvg";
|
||||
|
||||
postFixup = "
|
||||
for i in $out/bin/*; do
|
||||
patchelf --set-rpath /var/run/opengl-driver/lib:$(patchelf --print-rpath $i) $i
|
||||
done
|
||||
";
|
||||
|
||||
}
|
40
pkgs/applications/window-managers/compiz/0.6.2.nix
Normal file
40
pkgs/applications/window-managers/compiz/0.6.2.nix
Normal file
|
@ -0,0 +1,40 @@
|
|||
args : with args;
|
||||
with builderDefs {
|
||||
src = /* put a fetchurl here */
|
||||
fetchurl {
|
||||
url = http://releases.compiz-fusion.org/compiz/0.6.2/compiz-0.6.2.tar.bz2;
|
||||
sha256 = "0k58bkbyqx94ch7scvn3d26296ai9nddfb6lg8v3bhbi2zj4i2n5";
|
||||
};
|
||||
buildInputs = [
|
||||
pkgconfig libXrender xextproto gtk libwnck GConf libgnome
|
||||
libgnomeui metacity gnomegtk glib pango libglade libgtkhtml
|
||||
gtkhtml libgnomecanvas libgnomeprint libgnomeprintui gnomepanel
|
||||
librsvg fuse
|
||||
];
|
||||
propagatedBuildInputs = [
|
||||
libpng libXcomposite libXfixes libXdamage libXrandr libXinerama
|
||||
libICE libSM startupnotification mesa GConf perl perlXMLParser libxslt
|
||||
];
|
||||
configureFlags = ["--enable-gtk" "--enable-fuse"
|
||||
"--enable-annotate" "--enable-librsvg"];
|
||||
} null; /* null is a terminator for sumArgs */
|
||||
with stringsWithDeps;
|
||||
let
|
||||
postAll = FullDepEntry ("
|
||||
for i in $out/bin/*; do
|
||||
patchelf --set-rpath /var/run/opengl-driver/lib:$(patchelf --print-rpath $i) $i
|
||||
done
|
||||
") [minInit doMakeInstall];
|
||||
in
|
||||
|
||||
stdenv.mkDerivation
|
||||
rec {
|
||||
name = "compiz-0.6.2";
|
||||
builder = writeScript (name + "-builder")
|
||||
(textClosure [doConfigure doMakeInstall doForceShare postAll]);
|
||||
meta = {
|
||||
description = "
|
||||
Compiz window manager
|
||||
";
|
||||
};
|
||||
}
|
|
@ -1,33 +1,2 @@
|
|||
{ stdenv, fetchurl, pkgconfig, libpng, libXcomposite, libXfixes
|
||||
, libXdamage, libXrandr, libXinerama, libICE, libSM
|
||||
, startupnotification, libXrender, xextproto, mesa, gtk, libwnck, GConf
|
||||
, libgnome, libgnomeui, metacity
|
||||
, gnomegtk, glib, pango, libglade, libgtkhtml, gtkhtml, libgnomecanvas, libgnomeprint, libgnomeprintui, gnomepanel
|
||||
, librsvg, fuse
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "compiz-0.5.0";
|
||||
src = fetchurl {
|
||||
url = http://xorg.freedesktop.org/archive/individual/app/compiz-0.5.0.tar.gz;
|
||||
sha256 = "1fac5fc37b218k34lpxqlhs7srqxm7jly0hfncs3ghmjmxdlj03y";
|
||||
};
|
||||
patches = [
|
||||
./tfp-server-extension.patch
|
||||
];
|
||||
buildInputs = [
|
||||
pkgconfig libXrender xextproto gtk libwnck GConf libgnome libgnomeui metacity gnomegtk glib pango libglade libgtkhtml gtkhtml libgnomecanvas libgnomeprint libgnomeprintui gnomepanel librsvg fuse
|
||||
];
|
||||
propagatedBuildInputs = [
|
||||
libpng libXcomposite libXfixes libXdamage libXrandr libXinerama
|
||||
libICE libSM startupnotification mesa GConf
|
||||
];
|
||||
configureFlags = "--enable-gtk --enable-fuse --enable-annotate --enable-librsvg";
|
||||
|
||||
postFixup = "
|
||||
for i in $out/bin/*; do
|
||||
patchelf --set-rpath /var/run/opengl-driver/lib:$(patchelf --print-rpath $i) $i
|
||||
done
|
||||
";
|
||||
|
||||
}
|
||||
args :
|
||||
(import (__toPath ((toString ./JustNothing/.. )+"/"+args.version+".nix"))) args
|
||||
|
|
|
@ -3371,7 +3371,7 @@ rec {
|
|||
};
|
||||
};
|
||||
|
||||
compiz = assert mesaSupported; import ../applications/window-managers/compiz {
|
||||
compiz_050 = assert mesaSupported; import ../applications/window-managers/compiz/0.5.0.nix {
|
||||
inherit fetchurl stdenv pkgconfig libpng mesa;
|
||||
inherit (xorg) libXcomposite libXfixes libXdamage libXrandr
|
||||
libXinerama libICE libSM libXrender xextproto;
|
||||
|
@ -3384,6 +3384,37 @@ rec {
|
|||
gnomegtk = gnome.gtk;
|
||||
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 = assert mesaSupported; import ../applications/window-managers/compiz {
|
||||
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;
|
||||
version = getConfig ["compiz" "version"] "0.5.0";
|
||||
};
|
||||
|
||||
compizExtra = import ../applications/window-managers/compiz/extra.nix {
|
||||
inherit fetchurl stdenv pkgconfig compiz perl perlXMLParser dbus;
|
||||
|
|
2
pkgs/top-level/version-stub.nix
Normal file
2
pkgs/top-level/version-stub.nix
Normal file
|
@ -0,0 +1,2 @@
|
|||
args :
|
||||
(import (__toPath ((toString ./JustNothing/.. )+"/"+args.version+".nix"))) args
|
Loading…
Reference in a new issue