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

GNOME: Assorted fixes.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=14674
This commit is contained in:
Ludovic Courtès 2009-03-23 22:55:03 +00:00
parent 9845dc5aec
commit ca43b547b3
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,7 +78,7 @@ rec {
libgnome = import ./libgnome.nix { libgnome = import ./libgnome.nix {
inherit fetchurl stdenv gnome pkgconfig perl perlXMLParser inherit fetchurl stdenv gnome pkgconfig perl perlXMLParser
popt zlib esound gettext; popt zlib esound gettext intltool;
input = platform.libgnome; input = platform.libgnome;
}; };
@ -102,7 +102,9 @@ rec {
}; };
libbonobo = import ./libbonobo.nix { libbonobo = import ./libbonobo.nix {
inherit fetchurl stdenv pkgconfig perl perlXMLParser ORBit2 libxml2 popt flex gettext; inherit fetchurl stdenv pkgconfig perl perlXMLParser ORBit2
dbus dbus_glib libxml2 popt flex
gettext intltool;
yacc = bison; yacc = bison;
input = platform.libbonobo; input = platform.libbonobo;
}; };

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

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

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

@ -1,5 +1,5 @@
{ input, stdenv, fetchurl, gnome, pkgconfig, perl, perlXMLParser { input, stdenv, fetchurl, gnome, pkgconfig, perl, perlXMLParser
, popt, zlib, esound, gettext , popt, zlib, esound, gettext, intltool
}: }:
# !!! TODO CHECK: # !!! TODO CHECK:
@ -9,6 +9,6 @@
stdenv.mkDerivation { stdenv.mkDerivation {
inherit (input) name src; inherit (input) name src;
buildInputs = [pkgconfig perl perlXMLParser popt zlib esound gettext]; buildInputs = [pkgconfig perl perlXMLParser popt zlib esound gettext intltool];
propagatedBuildInputs = [gnome.glib gnome.gnomevfs gnome.libbonobo gnome.GConf]; propagatedBuildInputs = [gnome.glib gnome.gnomevfs gnome.libbonobo gnome.GConf];
} }

3
pkgs/desktops/gnome/libgnomeui.nix
View File

@ -1,11 +1,12 @@
{ input, stdenv, fetchurl, gnome, pkgconfig, perl, perlXMLParser { input, stdenv, fetchurl, gnome, pkgconfig, perl, perlXMLParser
, esound, libjpeg, gettext , esound, libjpeg, gettext, intltool
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
inherit (input) name src; inherit (input) name src;
buildInputs = [ buildInputs = [
pkgconfig perl perlXMLParser gnome.libglade esound libjpeg gettext pkgconfig perl perlXMLParser gnome.libglade esound libjpeg gettext
intltool
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
gnome.libgnome gnome.libgnomecanvas gnome.libbonoboui libjpeg gnome.libgnome gnome.libgnomecanvas gnome.libbonoboui libjpeg