mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 15:11:35 +00:00
Code Issues 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

76
pkgs/applications/window-managers/compiz/0.8.0.nix
View file

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