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

* Build metacity with compositing support.

Browse Source 
svn path=/nixpkgs/trunk/; revision=8114
This commit is contained in:
Eelco Dolstra 2007-02-28 17:52:41 +00:00
parent a6fe30b2df
commit 144a7c05b3
4 changed files with 41 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/desktops/gnome/default.nix
View File

@ -3,7 +3,7 @@
{ stdenv, fetchurl, pkgconfig, audiofile { stdenv, fetchurl, pkgconfig, audiofile
, flex, bison, popt, perl, zlib, libxml2, libxslt , flex, bison, popt, perl, zlib, libxml2, libxslt
, perlXMLParser, docbook_xml_dtd_42, gettext, x11, libtiff, libjpeg , perlXMLParser, docbook_xml_dtd_42, gettext, x11, libtiff, libjpeg
, libpng, gtkLibs, libXmu, libXinerama, libXrandr, libXcursor, bzip2 , libpng, gtkLibs, xlibs, bzip2, libcm
}: }:
rec { rec {
@ -172,7 +172,8 @@ rec {
gnomepanel = import ./gnome-panel.nix { gnomepanel = import ./gnome-panel.nix {
inherit fetchurl stdenv pkgconfig perl perlXMLParser glib gtk ORBit2 inherit fetchurl stdenv pkgconfig perl perlXMLParser glib gtk ORBit2
libgnome libgnomeui gnomedesktop libglade libwnck libgnome libgnomeui gnomedesktop libglade libwnck
libjpeg libpng scrollkeeper libXmu; libjpeg libpng scrollkeeper;
inherit (xlibs) libXmu;
input = desktop.gnomepanel; input = desktop.gnomepanel;
}; };
@ -188,8 +189,10 @@ rec {
metacity = import ./metacity.nix { metacity = import ./metacity.nix {
inherit stdenv fetchurl pkgconfig perl perlXMLParser glib gtk inherit stdenv fetchurl pkgconfig perl perlXMLParser glib gtk
GConf startupnotification libXinerama libXrandr libXcursor GConf startupnotification gettext libcm;
gettext; inherit (xlibs) libXinerama libXrandr libXcursor
libXcomposite libXfixes libXdamage;
enableCompositor = true;
input = desktop.metacity; input = desktop.metacity;
}; };

15
pkgs/desktops/gnome/metacity.nix
View File

@ -1,13 +1,24 @@
{ input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser, glib, gtk { input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser, glib, gtk
, GConf, startupnotification, libXinerama, libXrandr, libXcursor , GConf, startupnotification, libXinerama, libXrandr, libXcursor
, gettext , gettext
, enableCompositor ? false
, libXcomposite ? null, libXfixes ? null, libXdamage ? null, libcm ? null
}: }:
assert enableCompositor ->
libXcomposite != null && libXfixes != null && libXdamage != null && libcm != null;
stdenv.mkDerivation { stdenv.mkDerivation {
inherit (input) name src; inherit (input) name src;
buildInputs = [ buildInputs = [
pkgconfig perl perlXMLParser glib gtk GConf startupnotification pkgconfig perl perlXMLParser glib gtk GConf startupnotification
libXinerama libXrandr libXcursor gettext libXinerama libXrandr libXcursor gettext
]; ]
#configureFlags = "--disable-gconf"; ++ (if enableCompositor then [libXcomposite libXfixes libXdamage libcm] else []);
configureFlags = "
${if enableCompositor then "--enable-compositor" else ""}
";
} }

15
pkgs/development/libraries/libcm/default.nix Normal file
View File

@ -0,0 +1,15 @@
{stdenv, fetchurl, pkgconfig, glib, xlibs, mesa}:
stdenv.mkDerivation {
name = "libcm-0.1.1";
src = fetchurl {
url = http://ftp.gnome.org/pub/GNOME/sources/libcm/0.1/libcm-0.1.1.tar.bz2;
sha256 = "11i5z8l5v5ffihif35k5j8igj0rahsk4jdmsj24xhdw2s0zx53kn";
};
buildInputs = [
pkgconfig glib xlibs.xlibs xlibs.libXdamage xlibs.libXcomposite
xlibs.libXtst xlibs.inputproto
# !!! inputproto should really be propagated by libXtst
];
propagatedBuildInputs = [mesa];
}

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

@ -1434,6 +1434,11 @@ rec {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
libcm = import ../development/libraries/libcm {
inherit fetchurl stdenv pkgconfig xlibs mesa;
inherit (gtkLibs) glib;
};
libdrm = import ../development/libraries/libdrm { libdrm = import ../development/libraries/libdrm {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
@ -3010,9 +3015,7 @@ rec {
inherit fetchurl stdenv pkgconfig audiofile inherit fetchurl stdenv pkgconfig audiofile
flex bison popt zlib libxml2 libxslt flex bison popt zlib libxml2 libxslt
perl perlXMLParser docbook_xml_dtd_42 gettext x11 perl perlXMLParser docbook_xml_dtd_42 gettext x11
libtiff libjpeg libpng bzip2; libtiff libjpeg libpng gtkLibs xlibs bzip2 libcm;
gtkLibs = gtkLibs210; # !!! correct?
inherit (xlibs) libXmu libXinerama libXrandr libXcursor;
}); });
kdelibs = import ../desktops/kde/kdelibs { kdelibs = import ../desktops/kde/kdelibs {