diff options
author | Marc Weber <marco-oweber@gmx.de> | 2009-08-22 09:33:38 +0000 |
---|---|---|
committer | Marc Weber <marco-oweber@gmx.de> | 2009-08-22 09:33:38 +0000 |
commit | 84e5a942573ab5c282b7070d1aa5582c29712883 (patch) | |
tree | 738ff383821f7124d21fdd2dc781a4b732cd5afe /pkgs/applications/window-managers/compiz | |
parent | 159eebd8081849911750d84489a85a42857005c0 (diff) | |
download | nixlib-84e5a942573ab5c282b7070d1aa5582c29712883.tar nixlib-84e5a942573ab5c282b7070d1aa5582c29712883.tar.gz nixlib-84e5a942573ab5c282b7070d1aa5582c29712883.tar.bz2 nixlib-84e5a942573ab5c282b7070d1aa5582c29712883.tar.lz nixlib-84e5a942573ab5c282b7070d1aa5582c29712883.tar.xz nixlib-84e5a942573ab5c282b7070d1aa5582c29712883.tar.zst nixlib-84e5a942573ab5c282b7070d1aa5582c29712883.zip |
making compiz compile again. builderDefsPackage is used now
svn path=/nixpkgs/trunk/; revision=16809
Diffstat (limited to 'pkgs/applications/window-managers/compiz')
-rw-r--r-- | pkgs/applications/window-managers/compiz/0.8.0.nix | 76 |
1 files changed, 36 insertions, 40 deletions
diff --git a/pkgs/applications/window-managers/compiz/0.8.0.nix b/pkgs/applications/window-managers/compiz/0.8.0.nix index 5ce13690991d..40215b2b5495 100644 --- a/pkgs/applications/window-managers/compiz/0.8.0.nix +++ b/pkgs/applications/window-managers/compiz/0.8.0.nix @@ -1,48 +1,44 @@ args : with args; - let localDefs = builderDefs.passthru.function { - src = /* put a fetchurl here */ - 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 - ]; - 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 []); - }; - in with localDefs; -let - postAll = fullDepEntry (" +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 binutils + ]; + 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 + ]; + + 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"]; -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; - }; -} + 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" ]; + name = "compiz-0.8.0"; + + meta = { + description = "Compiz window manager"; + inherit src; + }; +} |