Added Compiz Fusion (main plugins). Also some dependencies, and made wmii build under setup-new-2.sh also.
svn path=/nixpkgs/trunk/; revision=9577
This commit is contained in:
Michael Raskin
@@ -0,0 +1,32 @@
|
||||
args : with args;
|
||||
with builderDefs {
|
||||
src = /* put a fetchurl here */
|
||||
fetchurl {
|
||||
url = http://releases.compiz-fusion.org/0.6.0/compiz-bcop-0.6.0.tar.bz2;
|
||||
sha256 = "0hw2ivvw696z325cqy7pmxb8cz30bqh67giw5fg6kzb9sn0x8v8f";
|
||||
};
|
||||
buildInputs = (import ../general-dependencies.nix args);
|
||||
propagatedBuildInputs = [getopt libxslt];
|
||||
configureFlags = [];
|
||||
} null; /* null is a terminator for sumArgs */
|
||||
with stringsWithDeps;
|
||||
let
|
||||
fixPkgconfig = FullDepEntry ("
|
||||
ensureDir \$out/lib
|
||||
ln -fs \$out/share/pkgconfig \$out/lib/pkgconfig
|
||||
") [minInit doMakeInstall defEnsureDir];
|
||||
fixInterpreter = FullDepEntry ("
|
||||
sed -e 's@^#!/bin/bash@#! ${stdenv.bash}/bin/bash@' -i \$out/bin/bcop
|
||||
") [minInit doMakeInstall];
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "compiz-bcop-"+version;
|
||||
builder = writeScript (name + "-builder")
|
||||
(textClosure [doAutotools doConfigure doMakeInstall fixPkgconfig fixInterpreter doForceShare
|
||||
doPropagate]);
|
||||
meta = {
|
||||
description = "
|
||||
Compiz BCOP.
|
||||
";
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,2 @@
|
||||
args :
|
||||
(import (__toPath ((toString ./JustNothing/.. )+"/"+args.version+".nix"))) args
|
||||
@@ -0,0 +1,28 @@
|
||||
args : with args;
|
||||
with builderDefs {
|
||||
src = /* put a fetchurl here */
|
||||
fetchurl {
|
||||
url = http://releases.compiz-fusion.org/0.6.0/ccsm-0.6.0.tar.bz2;
|
||||
sha256 = "11vv7ljy79szf74bp7wq969aj05p0x785zbiap1jnqlwq1wjkhir";
|
||||
};
|
||||
buildInputs = (import ../general-dependencies.nix args) ++
|
||||
[libcompizconfig bcop compizConfigPython python gettext pygtk
|
||||
pycairo configBackendGConf];
|
||||
configureFlags = [];
|
||||
wrappedEnv = [
|
||||
"PYTHONPATH" "$(toPythonPath \$out)"
|
||||
"PYTHONPATH" "\$PYTHONPATH"
|
||||
"PYTHONPATH" "$(toPythonPath ${pygtk})/gtk-2.0"
|
||||
];
|
||||
} null; /* null is a terminator for sumArgs */
|
||||
with stringsWithDeps;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "compizconfig-settings-"+args.version;
|
||||
builder = writeScript (name + "-builder")
|
||||
(textClosure [installPythonPackage (doWrap "\$out/bin/ccsm")]);
|
||||
meta = {
|
||||
description = "
|
||||
Compiz Settings Manager
|
||||
";
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,2 @@
|
||||
args :
|
||||
(import (__toPath ((toString ./JustNothing/.. )+"/"+args.version+".nix"))) args
|
||||
@@ -0,0 +1,44 @@
|
||||
args : with args;
|
||||
with builderDefs {
|
||||
src = /* put a fetchurl here */
|
||||
fetchurl {
|
||||
url = http://releases.compiz-fusion.org/0.6.0/compiz-manager-0.6.0.tar.bz2;
|
||||
sha256 = "0bjl0kwzl4mc9nw2id8z5q5ikgm8c5zrknn9nm851if005479q3v";
|
||||
};
|
||||
buildInputs = (import ../general-dependencies.nix args) ++
|
||||
[bcop ccsm xvinfo glxinfo xdpyinfo ];
|
||||
shellReplacements = ["compiz-manager" [
|
||||
"COMPIZ_BIN_PATH" "${compiz}/bin/"
|
||||
"PLUGIN_PATH" "/var/run/current-system/sw/share/compiz-plugins/compiz/"
|
||||
"GLXINFO" "${glxinfo}/bin/glxinfo"
|
||||
"KWIN" "/var/run/current-system/sws/bin/kwin"
|
||||
"METACITY" "/var/run/current-system/sws/bin/metacity"
|
||||
"COMPIZ_NAME" "compiz"
|
||||
"FALLBACKWM" "'\''\"\${KWIN}\"'\''"
|
||||
"WHITELIST" "nvidia intel ati radeon i810 i830 i915"
|
||||
"INDIRECT" "yes"
|
||||
"XORG_DRIVER_PATH" "/nix/store/.*"
|
||||
]];
|
||||
} null; /* null is a terminator for sumArgs */
|
||||
with stringsWithDeps;
|
||||
let
|
||||
install = FullDepEntry ("
|
||||
sed -e '/Checking for texture_from_pixmap:/areturn 0' -i compiz-manager
|
||||
sed -e '/Checking for non power of two support: /areturn 0' -i compiz-manager
|
||||
sed -e '/^\s*$/aPATH=\$PATH:${xvinfo}/bin:${xdpyinfo}/bin' -i compiz-manager
|
||||
|
||||
ensureDir \$out/bin
|
||||
cp compiz-manager \$out/bin
|
||||
")
|
||||
[minInit doUnpack defEnsureDir];
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "compiz-manager-"+args.version;
|
||||
builder = writeScript (name + "-builder")
|
||||
(textClosure [doUnpack doReplaceScripts install doPropagate doForceShare]);
|
||||
meta = {
|
||||
description = "
|
||||
Compiz Launch Manager
|
||||
";
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,2 @@
|
||||
args :
|
||||
(import (__toPath ((toString ./JustNothing/.. )+"/"+args.version+".nix"))) args
|
||||
@@ -0,0 +1,22 @@
|
||||
args : with args;
|
||||
with builderDefs {
|
||||
src = /* put a fetchurl here */
|
||||
fetchurl {
|
||||
url = http://releases.compiz-fusion.org/0.6.0.1/compizconfig-python-0.6.0.1.tar.bz2;
|
||||
sha256 = "0im67mxnm30a3xd3rvfwrgfp4ic2x5axpjdahx0f5p9pnfy0jm4n";
|
||||
};
|
||||
buildInputs = (import ../general-dependencies.nix args) ++
|
||||
[libcompizconfig bcop python pyrex];
|
||||
configureFlags = [];
|
||||
} null; /* null is a terminator for sumArgs */
|
||||
with stringsWithDeps;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "compizconfig-python-"+args.version;
|
||||
builder = writeScript (name + "-builder")
|
||||
(textClosure [doAutotools doConfigure doMakeInstall doForceShare]);
|
||||
meta = {
|
||||
description = "
|
||||
Compiz configuration - Python part.
|
||||
";
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,2 @@
|
||||
args :
|
||||
(import (__toPath ((toString ./JustNothing/.. )+"/"+args.version+".nix"))) args
|
||||
@@ -0,0 +1,22 @@
|
||||
args : with args;
|
||||
with builderDefs {
|
||||
src = /* put a fetchurl here */
|
||||
fetchurl {
|
||||
url = http://releases.compiz-fusion.org/0.6.0/compizconfig-backend-gconf-0.6.0.tar.bz2;
|
||||
sha256 = "0h0r9sicc4pla5vag0j5qkllyagbs8dv5ai7fga48ln7q35y2mjr";
|
||||
};
|
||||
buildInputs = (import ../general-dependencies.nix args) ++
|
||||
[libcompizconfig bcop];
|
||||
configureFlags = [];
|
||||
} null; /* null is a terminator for sumArgs */
|
||||
with stringsWithDeps;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "compizconfig-backend-GConf-"+version;
|
||||
builder = writeScript (name + "-builder")
|
||||
(textClosure [doAutotools doConfigure doMakeInstall doForceShare]);
|
||||
meta = {
|
||||
description = "
|
||||
Compiz configuration backend (GConf).
|
||||
";
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,2 @@
|
||||
args :
|
||||
(import (__toPath ((toString ./JustNothing/.. )+"/"+args.version+".nix"))) args
|
||||
@@ -0,0 +1,12 @@
|
||||
args : with args;
|
||||
rec
|
||||
{
|
||||
bcop = import ./bcop args;
|
||||
libcompizconfig = import ./libcompizconfig (args // {inherit bcop;});
|
||||
configBackendGConf = import ./config-backend (args // {inherit libcompizconfig bcop;});
|
||||
compizConfigPython = import ./compizconfig-python (args // {inherit libcompizconfig
|
||||
bcop pyrex;});
|
||||
ccsm = import ./ccsm (args // {inherit libcompizconfig bcop compizConfigPython configBackendGConf;});
|
||||
pluginsMain = import ./main (args //{inherit bcop ;});
|
||||
compizManager = import ./compiz-manager (args // {inherit bcop ccsm;});
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
/* Ubuntu dependencies
|
||||
build-essential libxcomposite-dev libpng12-dev libsm-dev libxrandr-dev libxdamage-dev libxinerama-dev libstartup-notification0-dev libgconf2-dev libgl1-mesa-dev libglu1-mesa-dev libmetacity-dev librsvg2-dev libdbus-1-dev libdbus-glib-1-dev libgnome-desktop-dev libgnome-window-settings-dev gitweb curl autoconf automake automake1.9 libtool intltool libxslt1-dev xsltproc libwnck-dev
|
||||
*/
|
||||
args: with args;
|
||||
[
|
||||
libXcomposite libpng libSM libXrandr libXdamage libXinerama startupnotification
|
||||
GConf mesa metacity librsvg dbus dbus_glib gnomedesktop git autoconf automake
|
||||
libtool libxslt libwnck intltool perl perlXMLParser compiz
|
||||
]
|
||||
@@ -0,0 +1,22 @@
|
||||
args : with args;
|
||||
with builderDefs {
|
||||
src = /* put a fetchurl here */
|
||||
fetchurl {
|
||||
url = http://releases.compiz-fusion.org/0.6.0/libcompizconfig-0.6.0.tar.bz2;
|
||||
sha256 = "1p75p29qg2syk1b4cvkf9ds5qv3h2jnqa6gs38rivbyqqvrcgkij";
|
||||
};
|
||||
buildInputs = (import ../general-dependencies.nix args)++
|
||||
[bcop];
|
||||
configureFlags = [];
|
||||
} null; /* null is a terminator for sumArgs */
|
||||
with stringsWithDeps;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libcompizconfig-"+version;
|
||||
builder = writeScript (name + "-builder")
|
||||
(textClosure [doAutotools doConfigure doMakeInstall doForceShare]);
|
||||
meta = {
|
||||
description = "
|
||||
Compiz configuration backend library.
|
||||
";
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,2 @@
|
||||
args :
|
||||
(import (__toPath ((toString ./JustNothing/.. )+"/"+args.version+".nix"))) args
|
||||
@@ -0,0 +1,28 @@
|
||||
args : with args;
|
||||
with builderDefs {
|
||||
src = /* put a fetchurl here */
|
||||
fetchurl {
|
||||
url = http://releases.compiz-fusion.org/0.6.0/compiz-fusion-plugins-main-0.6.0.tar.bz2;
|
||||
sha256 = "1pn6s8lrzgg2allfp1rdmd6kinx8whnj8sb38aqzirmy1s6gfsvi";
|
||||
};
|
||||
buildInputs = (import ../general-dependencies.nix args)++
|
||||
[bcop libjpeg gettext];
|
||||
configureFlags = [];
|
||||
} null; /* null is a terminator for sumArgs */
|
||||
with stringsWithDeps;
|
||||
let
|
||||
sharePlugins = FullDepEntry ("
|
||||
ensureDir \$out/share/compiz-plugins
|
||||
ln -vsf \$out/lib/compiz \$out/share/compiz-plugins
|
||||
") [minInit doMakeInstall defEnsureDir];
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "compiz-fusion-plugins-main-"+version;
|
||||
builder = writeScript (name + "-builder")
|
||||
(textClosure [doConfigure doMakeInstall sharePlugins doForceShare]);
|
||||
meta = {
|
||||
description = "
|
||||
Main Compiz Fusion plugins.
|
||||
";
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,2 @@
|
||||
args :
|
||||
(import (__toPath ((toString ./JustNothing/.. )+"/"+args.version+".nix"))) args
|
||||
@@ -9,14 +9,17 @@ args : with args;
|
||||
pkgconfig libXrender xextproto gtk libwnck GConf libgnome
|
||||
libgnomeui metacity gnomegtk glib pango libglade libgtkhtml
|
||||
gtkhtml libgnomecanvas libgnomeprint libgnomeprintui gnomepanel
|
||||
librsvg fuse
|
||||
librsvg fuse
|
||||
];
|
||||
propagatedBuildInputs = [
|
||||
libpng libXcomposite libXfixes libXdamage libXrandr libXinerama
|
||||
libICE libSM startupnotification mesa GConf perl perlXMLParser libxslt
|
||||
dbus dbus_glib
|
||||
];
|
||||
configureFlags = ["--enable-gtk" "--enable-fuse"
|
||||
"--enable-annotate" "--enable-librsvg"];
|
||||
"--enable-annotate" "--enable-librsvg"] ++
|
||||
(if args ? extraConfigureFlags then args.extraConfigureFlags else []);
|
||||
patches = [ ./glx-patch-0.6.2.patch ];
|
||||
} null; /* null is a terminator for sumArgs */
|
||||
with stringsWithDeps;
|
||||
let
|
||||
@@ -24,14 +27,16 @@ let
|
||||
for i in $out/bin/*; do
|
||||
patchelf --set-rpath /var/run/opengl-driver/lib:$(patchelf --print-rpath $i) $i
|
||||
done
|
||||
") [minInit doMakeInstall];
|
||||
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 [doConfigure doMakeInstall doForceShare postAll]);
|
||||
(textClosure [doPatch doConfigure doMakeInstall doForceShare postAll]);
|
||||
meta = {
|
||||
description = "
|
||||
Compiz window manager
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
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");
|
||||
@@ -8,8 +8,8 @@ args: with args; stdenv.mkDerivation {
|
||||
|
||||
buildInputs = [ libX11 libixp ];
|
||||
inherit libixp;
|
||||
|
||||
phases = "installPhase";
|
||||
|
||||
phases = (if args.includeUnpack then "unpackPhase " else "")+"installPhase";
|
||||
|
||||
installPhase = "
|
||||
export CFLAGS=\$NIX_CFLAGS_COMPILE
|
||||
@@ -17,6 +17,7 @@ args: with args; stdenv.mkDerivation {
|
||||
sed -i -e \"s%^PREFIX.*%PREFIX=\$out%\" \\
|
||||
-e \"s%^\\(INCS.*\\)%\\1 \$NIX_CFLAGS_COMPILE%\" \\
|
||||
-e \"s%^\\(LIBS.*\\)%\\1 \$LDFLAGS%\" \\
|
||||
-e 's%^\\(AWKPATH = \\).*%\\1${gawk}/bin/gawk%' \\
|
||||
config.mk
|
||||
# don't use the default one installed by nixos!
|
||||
sed -i -e \"s%ixpc%\$libixp/bin/ixpc%\" wmiir
|
||||
|
||||
@@ -9,7 +9,7 @@ args: with args; stdenv.mkDerivation {
|
||||
buildInputs = [ libX11 libixp ];
|
||||
inherit libixp;
|
||||
|
||||
phases = "installPhase";
|
||||
phases = (if args.includeUnpack then "unpackPhase " else "")+"installPhase";
|
||||
|
||||
installPhase = "
|
||||
export CFLAGS=\$NIX_CFLAGS_COMPILE
|
||||
|
||||
Reference in New Issue
Block a user