diff options
| author | Wouter den Breejen <uu@denbreejen.net> | 2007-05-28 14:10:46 +0000 |
|---|---|---|
| committer | Wouter den Breejen <uu@denbreejen.net> | 2007-05-28 14:10:46 +0000 |
| commit | 5200276c3b5a475242835a6c171c8f5c2e6c044e (patch) | |
| tree | b4173829c6dc21b6782a677d78cf1655b278b74b /pkgs/applications/window-managers/compiz | |
| parent | 1dcd8601bffe904714a6d4db0a9675ae643c8968 (diff) | |
| download | nixpkgs-5200276c3b5a475242835a6c171c8f5c2e6c044e.tar nixpkgs-5200276c3b5a475242835a6c171c8f5c2e6c044e.tar.gz nixpkgs-5200276c3b5a475242835a6c171c8f5c2e6c044e.tar.bz2 nixpkgs-5200276c3b5a475242835a6c171c8f5c2e6c044e.tar.lz nixpkgs-5200276c3b5a475242835a6c171c8f5c2e6c044e.tar.xz nixpkgs-5200276c3b5a475242835a6c171c8f5c2e6c044e.tar.zst nixpkgs-5200276c3b5a475242835a6c171c8f5c2e6c044e.zip | |
nixpkgs dir: nvidia and libsrvg
svn path=/nixpkgs/trunk/; revision=8785
Diffstat (limited to 'pkgs/applications/window-managers/compiz')
| -rw-r--r-- | pkgs/applications/window-managers/compiz/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/applications/window-managers/compiz/extra.nix | 2 |
2 files changed, 14 insertions, 4 deletions
diff --git a/pkgs/applications/window-managers/compiz/default.nix b/pkgs/applications/window-managers/compiz/default.nix index 3ba52518d38..25cee0600bb 100644 --- a/pkgs/applications/window-managers/compiz/default.nix +++ b/pkgs/applications/window-managers/compiz/default.nix @@ -1,6 +1,9 @@ { 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 }: stdenv.mkDerivation { @@ -13,11 +16,18 @@ stdenv.mkDerivation { ./tfp-server-extension.patch ]; buildInputs = [ - pkgconfig libXrender xextproto gtk libwnck GConf + 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 + libICE libSM startupnotification mesa GConf ]; - configureFlags = "--enable-gtk"; + configureFlags = "--enable-gtk --enable-fuse --enable-annotate --enable-librsvg"; + + postFixup = " + for i in $out/bin/*; do + patchelf --set-rpath /var/state/opengl-driver/lib:$(patchelf --print-rpath $i) $i + done + "; + } diff --git a/pkgs/applications/window-managers/compiz/extra.nix b/pkgs/applications/window-managers/compiz/extra.nix index af2671945d2..75d640ca1ca 100644 --- a/pkgs/applications/window-managers/compiz/extra.nix +++ b/pkgs/applications/window-managers/compiz/extra.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "compiz-extra-20070305"; src = fetchurl { url = http://gandalfn.club.fr/ubuntu/compiz-extra/compiz-extra-latest.tar.bz2; - sha256 = "1cm5cayhpnlhj0fhg8lqghdk52h9gmv4jv98zzadj3r3fd8mwr9z"; + sha256 = "7fc7faafccfdf22dea7ac1de6629dcb55ec63d84fcb57a14559309cf284fa94f"; }; buildInputs = [ pkgconfig compiz perl perlXMLParser GConf dbus gtk |