ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 13:57:10 +03:00
Code Issues Projects Releases Wiki Activity

* Get rid of some old Compiz versions.

Browse Source 
svn path=/nixpkgs/trunk/; revision=16868
This commit is contained in:
Eelco Dolstra 2009-08-26 17:04:15 +00:00
parent c76f009dd9
commit 9358ffa39c
6 changed files with 1 additions and 203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pkgs/applications/window-managers/compiz/0.5.0.nix
View File

@ -1,33 +0,0 @@
/*{ 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
";
}

47
pkgs/applications/window-managers/compiz/0.6.2.nix
View File

@ -1,47 +0,0 @@
args : with args;
let localDefs = builderDefs.passthru.function {
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 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
dbus.libs dbus_glib compositeproto fixesproto damageproto randrproto
xineramaproto renderproto kbproto xextproto libXrender
];
configureFlags = ["--enable-gtk" "--enable-fuse"
"--enable-annotate" "--enable-librsvg"] ++
(if args ? extraConfigureFlags then args.extraConfigureFlags else []);
patches = [ ./glx-patch-0.6.2.patch ];
};
in with localDefs;
let
postAll = fullDepEntry ("
for i in $out/bin/*; do
patchelf --set-rpath /var/run/opengl-driver/lib:$(patchelf --print-rpath $i) $i
done
ensureDir \$out/share/compiz-plugins/
ln -sfv \$out/lib/compiz \$out/share/compiz-plugins/
") [minInit doMakeInstall defEnsureDir];
in
stdenv.mkDerivation
rec {
name = "compiz-0.6.2";
builder = writeScript (name + "-builder")
(textClosure localDefs [doPatch doConfigure doMakeInstall doPropagate
doForceShare postAll]);
inherit propagatedBuildInputs;
meta = {
description = "Compiz window manager";
inherit src;
};
}

49
pkgs/applications/window-managers/compiz/0.7.8.nix
View File

@ -1,49 +0,0 @@
args : with args;
let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */
fetchurl {
url = http://xorg.freedesktop.org/archive/individual/app/compiz-0.7.8.tar.gz;
sha256 = "00v5br8vi9ycrzvgdsmdbv31kv1n9g88hxm0ax9yhy6cfsvm4vxl";
};
buildInputs = [
pkgconfig gtk libwnck GConf libgnome
libgnomeui metacity gnomegtk glib pango libglade libgtkhtml
gtkhtml libgnomecanvas libgnomeprint libgnomeprintui gnomepanel
librsvg fuse gettext
];
propagatedBuildInputs = [
libpng libXcomposite libXfixes libXdamage libXrandr libXinerama
libICE libSM startupnotification mesa GConf perl perlXMLParser libxslt
dbus.libs dbus_glib compositeproto fixesproto damageproto randrproto
xineramaproto renderproto kbproto xextproto libXrender xproto libX11
libxcb
];
configureFlags = ["--enable-gtk" "--enable-fuse"
"--enable-annotate" "--enable-librsvg"] ++
(if args ? extraConfigureFlags then args.extraConfigureFlags else []);
patches = [ ./glx-patch-0.6.2.patch ];
};
in with localDefs;
let
postAll = fullDepEntry ("
for i in $out/bin/*; do
patchelf --set-rpath /var/run/opengl-driver/lib:$(patchelf --print-rpath $i) $i
done
ensureDir \$out/share/compiz-plugins/
ln -sfv \$out/lib/compiz \$out/share/compiz-plugins/
") [minInit doMakeInstall defEnsureDir];
in
stdenv.mkDerivation
rec {
name = "compiz-0.7.8";
builder = writeScript (name + "-builder")
(textClosure localDefs [doPatch doConfigure doMakeInstall doPropagate
doForceShare postAll]);
inherit propagatedBuildInputs;
meta = {
description = "Compiz window manager";
inherit src;
};
}

12
pkgs/applications/window-managers/compiz/glx-patch-0.6.2.patch
View File

@ -1,12 +0,0 @@
diff -r -U3 compiz-0.6.2/src/screen.c compiz-0.6.2-mod/src/screen.c
--- compiz-0.6.2/src/screen.c 2007-10-17 17:12:58.000000000 +0400
+++ compiz-0.6.2-mod/src/screen.c 2007-11-04 01:28:07.000000000 +0300
@@ -1708,7 +1708,7 @@
}
glxExtensions = glXQueryExtensionsString (dpy, screenNum);
- if (!strstr (glxExtensions, "GLX_EXT_texture_from_pixmap"))
+ if (/*!strstr (glxExtensions, "GLX_EXT_texture_from_pixmap")*/ 0)
{
compLogMessage (display, "core", CompLogLevelFatal,
"GLX_EXT_texture_from_pixmap is missing");

44
pkgs/applications/window-managers/compiz/tfp-server-extension.patch
View File

@ -1,44 +0,0 @@
diff -rc compiz-0.5.0-orig/src/screen.c compiz-0.5.0/src/screen.c
*** compiz-0.5.0-orig/src/screen.c 2007-04-02 20:15:30.000000000 +0200
--- compiz-0.5.0/src/screen.c 2007-04-18 21:52:43.000000000 +0200
***************
*** 1533,1539 ****
Window *children;
unsigned int nchildren;
int defaultDepth, nvisinfo, nElements, value, i;
! const char *glxExtensions, *glExtensions;
XSetWindowAttributes attrib;
GLfloat globalAmbient[] = { 0.1f, 0.1f, 0.1f, 0.1f };
GLfloat ambientLight[] = { 0.0f, 0.0f, 0.0f, 0.0f };
--- 1533,1540 ----
Window *children;
unsigned int nchildren;
int defaultDepth, nvisinfo, nElements, value, i;
! const char *glxExtensions = NULL, *glExtensions;
! const char *glxServerExtensions = NULL;
XSetWindowAttributes attrib;
GLfloat globalAmbient[] = { 0.1f, 0.1f, 0.1f, 0.1f };
GLfloat ambientLight[] = { 0.0f, 0.0f, 0.0f, 0.0f };
***************
*** 1793,1800 ****
if (glXIsDirect (dpy, s->ctx) == indirectRendering)
i++;
glxExtensions = glXQueryExtensionsString (dpy, screenNum);
! if (!strstr (glxExtensions, "GLX_EXT_texture_from_pixmap"))
{
if (i > 0)
{
--- 1794,1805 ----
if (glXIsDirect (dpy, s->ctx) == indirectRendering)
i++;
+ glxServerExtensions = glXQueryServerString(dpy,
+ screenNum, GLX_EXTENSIONS );
glxExtensions = glXQueryExtensionsString (dpy, screenNum);
!
! if (!strstr (indirectRendering ? glxServerExtensions : glxExtensions,
! "GLX_EXT_texture_from_pixmap"))
{
if (i > 0)
{

19
pkgs/top-level/all-packages.nix
View File

@ -6085,24 +6085,7 @@ let
inherit (gnome) esound;
};
compiz_050 = 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;
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 = compiz.passthru.function {
version = "0.6.2";
};
compizBase = (builderDefsPackage (selectVersion ../applications/window-managers/compiz "0.8.0")) {
compizBase = (builderDefsPackage (import ../applications/window-managers/compiz/0.8.0.nix)) {
inherit lib stringsWithDeps builderDefs;
inherit fetchurl stdenv pkgconfig libpng mesa perl perlXMLParser libxslt gettext
intltool binutils;