JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

making compiz compile again. builderDefsPackage is used now

Browse Source 
svn path=/nixpkgs/trunk/; revision=16809
This commit is contained in:
Marc Weber 2009-08-22 09:33:38 +00:00
parent 159eebd808
commit 84e5a94257
2 changed files with 38 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pkgs/applications/window-managers/compiz/0.8.0.nix
View File

@ -1,15 +1,15 @@
args : with args;
let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */
fetchurl {
rec {
src = fetchurl {
url = "http://releases.compiz-fusion.org/core/compiz-0.8.0.tar.gz";
sha256 = "0xhyilfz2cfbdwni774b54171addjqw7hda6j6snzxb1igny7iry";
};
buildInputs = [
pkgconfig gtk libwnck GConf libgnome
libgnomeui metacity gnomegtk glib pango libglade libgtkhtml
gtkhtml libgnomecanvas libgnomeprint libgnomeprintui gnomepanel
librsvg fuse gettext intltool
librsvg fuse gettext intltool binutils
];
propagatedBuildInputs = [
libpng libXcomposite libXfixes libXdamage libXrandr libXinerama
@ -18,31 +18,27 @@ args : with args;
xineramaproto renderproto kbproto xextproto libXrender xproto libX11
libxcb
];
configureFlags = ["--enable-gtk" "--enable-fuse"
"--enable-annotate" "--enable-librsvg"] ++
(if args ? extraConfigureFlags then args.extraConfigureFlags else []);
};
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
") ["minInit" "doMakeInstall" "defEnsureDir"];
configureFlags = ["--enable-gtk" "--enable-fuse"
"--enable-annotate" "--enable-librsvg"] ++
(if args ? extraConfigureFlags then args.extraConfigureFlags else []);
/* doConfigure should be specified separately */
phaseNames = [ "doPatch" "doConfigure" "doMakeInstall" "doPropagate"
"doForceShare" "postAll" ];
stdenv.mkDerivation
rec {
name = "compiz-0.8.0";
builder = writeScript (name + "-builder")
(textClosure localDefs [doPatch doConfigure doMakeInstall doPropagate
doForceShare postAll]);
inherit propagatedBuildInputs;
meta = {
description = "Compiz window manager";
inherit src;
};
}

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

@ -6039,10 +6039,10 @@ let
version = "0.6.2";
};
compizBase = composedArgsAndFun (selectVersion ../applications/window-managers/compiz "0.8.0") {
compizBase = builderDefsPackage (selectVersion ../applications/window-managers/compiz "0.8.0") {
inherit lib builderDefs stringsWithDeps;
inherit fetchurl stdenv pkgconfig libpng mesa perl perlXMLParser libxslt gettext
intltool;
intltool binutils;
inherit (xorg) libXcomposite libXfixes libXdamage libXrandr
libXinerama libICE libSM libXrender xextproto compositeproto fixesproto
damageproto randrproto xineramaproto renderproto kbproto xproto libX11