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

* Build Compiz with GConf support.

Browse Source 
* Add some Gnome interdependencies.

svn path=/nixpkgs/trunk/; revision=8125
This commit is contained in:
Eelco Dolstra 2007-03-01 00:40:27 +00:00
parent fcab5576cb
commit 5dde0fead7
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/window-managers/compiz/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, libpng, libXcomposite, libXfixes
, libXdamage, libXrandr, libXinerama, libICE, libSM
, startupnotification, libXrender, xextproto, mesa, gtk, libwnck
, startupnotification, libXrender, xextproto, mesa, gtk, libwnck, GConf
}:
stdenv.mkDerivation {
@ -16,7 +16,7 @@ stdenv.mkDerivation {
buildInputs = [
pkgconfig libpng libXcomposite libXfixes libXdamage libXrandr
libXinerama libICE libSM startupnotification libXrender xextproto
mesa gtk libwnck
mesa gtk libwnck GConf
];
configureFlags = "--disable-gconf --enable-gtk";
configureFlags = "--enable-gtk";
}

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

@ -45,7 +45,7 @@ rec {
};
gnomemimedata = import ./gnome-mime-data.nix {
inherit fetchurl stdenv pkgconfig perl perlXMLParser;
inherit fetchurl stdenv pkgconfig perl perlXMLParser gettext;
input = platform.gnomemimedata;
};
@ -84,7 +84,7 @@ rec {
};
libbonobo = import ./libbonobo.nix {
inherit fetchurl stdenv pkgconfig perl perlXMLParser ORBit2 libxml2 popt flex;
inherit fetchurl stdenv pkgconfig perl perlXMLParser ORBit2 libxml2 popt flex gettext;
yacc = bison;
input = platform.libbonobo;
};
@ -141,7 +141,7 @@ rec {
};
gnomekeyring = import ./gnome-keyring.nix {
inherit fetchurl stdenv pkgconfig glib gtk;
inherit fetchurl stdenv pkgconfig glib gtk perl perlXMLParser gettext;
input = desktop.gnomekeyring;
};

4
pkgs/desktops/gnome/gnome-keyring.nix
View File

@ -1,9 +1,9 @@
# gnome-keyring
{input, stdenv, fetchurl, pkgconfig, glib, gtk}:
{input, stdenv, fetchurl, pkgconfig, glib, gtk, perl, perlXMLParser, gettext}:
stdenv.mkDerivation {
inherit (input) name src;
buildInputs = [pkgconfig gtk glib];
buildInputs = [pkgconfig gtk glib perl perlXMLParser gettext];
CFLAGS = "-DENABLE_NLS=0";
}

4
pkgs/desktops/gnome/gnome-mime-data.nix
View File

@ -1,8 +1,8 @@
{input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser}:
{input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser, gettext}:
assert pkgconfig != null && perl != null;
stdenv.mkDerivation {
inherit (input) name src;
buildInputs = [pkgconfig perl perlXMLParser];
buildInputs = [pkgconfig perl perlXMLParser gettext];
}

4
pkgs/desktops/gnome/libbonobo.nix
View File

@ -1,4 +1,4 @@
{input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser, ORBit2, libxml2, popt, yacc, flex}:
{input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser, ORBit2, libxml2, popt, yacc, flex, gettext}:
assert pkgconfig != null && perl != null && ORBit2 != null
&& libxml2 != null && popt != null && yacc != null && flex != null;
@ -6,6 +6,6 @@ assert pkgconfig != null && perl != null && ORBit2 != null
# todo 2.8.1 doesn;t work
stdenv.mkDerivation {
inherit (input) name src;
buildInputs = [pkgconfig perl perlXMLParser libxml2 yacc flex];
buildInputs = [pkgconfig perl perlXMLParser libxml2 yacc flex gettext];
propagatedBuildInputs = [ORBit2 popt];
}

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

@ -2535,7 +2535,7 @@ rec {
inherit fetchurl stdenv pkgconfig libpng mesa;
inherit (xorg) libXcomposite libXfixes libXdamage libXrandr
libXinerama libICE libSM libXrender xextproto;
inherit (gnome) startupnotification libwnck;
inherit (gnome) startupnotification libwnck GConf;
inherit (gtkLibs) gtk;
};