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

* Some Gnome packages need intltool in the stdenv branch (don't know

Browse Source 
why they built correctly in the trunk...).

svn path=/nixpkgs/branches/stdenv-updates/; revision=14823
This commit is contained in:
Eelco Dolstra 2009-04-01 11:46:26 +00:00
parent 3d6086c7a7
commit 956e469d5a
6 changed files with 36 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,7 +142,7 @@ rec {
buildInputs = [ buildInputs = [
perl perlXMLParser pkgconfig popt libxml2 perl perlXMLParser pkgconfig popt libxml2
glib pango bison flex gettext glib pango bison flex gettext intltool
]; ];
propagatedBuildInputs = [libxml2 libart_lgpl]; propagatedBuildInputs = [libxml2 libart_lgpl];
@ -206,21 +206,30 @@ rec {
}; };
}; };
gnomedesktop = import ./gnome-desktop.nix { gnomedesktop = stdenv.mkDerivation {
inherit fetchurl stdenv pkgconfig gnome perl perlXMLParser inherit (desktop.gnomedesktop) name src;
libjpeg gettext which python libxml2Python libxslt;
input = desktop.gnomedesktop; # !!! should get rid of libxml2Python, see gnomedocutils
buildInputs = [
pkgconfig perl perlXMLParser gtk glib libgnomeui
scrollkeeper libjpeg gnomedocutils gettext which
python libxml2Python libxslt intltool
];
configureFlags = "--disable-scrollkeeper";
}; };
libwnck = import ./libwnck.nix { libwnck = stdenv.mkDerivation {
inherit fetchurl stdenv pkgconfig gtk perl perlXMLParser gettext; inherit (desktop.libwnck) name src;
input = desktop.libwnck; buildInputs = [pkgconfig gtk perl perlXMLParser gettext intltool];
}; };
gnomemenus = import ./gnome-menus.nix { gnomemenus = stdenv.mkDerivation {
inherit fetchurl stdenv pkgconfig gnome perl perlXMLParser inherit (desktop.gnomemenus) name src;
python gettext; buildInputs = [
input = desktop.gnomemenus; pkgconfig perl perlXMLParser glib python gettext intltool
];
}; };
librsvg = stdenv.mkDerivation { librsvg = stdenv.mkDerivation {
@ -230,7 +239,7 @@ rec {
libgweather = stdenv.mkDerivation { libgweather = stdenv.mkDerivation {
inherit (desktop.libgweather) name src; inherit (desktop.libgweather) name src;
buildInputs = [gettext perl perlXMLParser pkgconfig gtk libxml2 gnomevfs]; buildInputs = [gettext perl perlXMLParser pkgconfig gtk libxml2 gnomevfs intltool];
}; };
gnomepanel = stdenv.mkDerivation { gnomepanel = stdenv.mkDerivation {
@ -266,7 +275,7 @@ 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 gettext libcm; GConf startupnotification gettext libcm intltool;
inherit (xlibs) libXinerama libXrandr libXcursor inherit (xlibs) libXinerama libXrandr libXcursor
libXcomposite libXfixes libXdamage; libXcomposite libXfixes libXdamage;
enableCompositor = true; enableCompositor = true;
@ -285,10 +294,14 @@ rec {
input = desktop.gconfeditor; input = desktop.gconfeditor;
}; };
vte = import ./vte.nix { vte = stdenv.mkDerivation {
inherit stdenv fetchurl pkgconfig gnome perl perlXMLParser ncurses inherit (desktop.vte) name src;
python gettext;
input = desktop.vte; buildInputs = [
pkgconfig perl perlXMLParser gnome.glib gnome.gtk python gettext intltool
];
propagatedBuildInputs = [ncurses];
}; };
gnometerminal = stdenv.mkDerivation { gnometerminal = stdenv.mkDerivation {

17
pkgs/desktops/gnome/gnome-desktop.nix
View File

@ -1,17 +0,0 @@
{ input, stdenv, fetchurl, gnome, pkgconfig, perl, perlXMLParser
, libjpeg, gettext, which, python, libxml2Python, libxslt
}:
# !!! should get rid of libxml2Python, see gnomedocutils
stdenv.mkDerivation {
inherit (input) name src;
buildInputs = [
pkgconfig perl perlXMLParser gnome.gtk gnome.glib gnome.libgnomeui
gnome.scrollkeeper libjpeg gnome.gnomedocutils gettext which
python libxml2Python libxslt
];
configureFlags = "--disable-scrollkeeper";
}

10
pkgs/desktops/gnome/gnome-menus.nix
View File

@ -1,10 +0,0 @@
{ input, stdenv, fetchurl, gnome, pkgconfig, perl, perlXMLParser
, python, gettext
}:
stdenv.mkDerivation {
inherit (input) name src;
buildInputs = [
pkgconfig perl perlXMLParser gnome.glib python gettext
];
}

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

@ -1,6 +0,0 @@
{input, stdenv, fetchurl, pkgconfig, gtk, perl, perlXMLParser, gettext}:
stdenv.mkDerivation {
inherit (input) name src;
buildInputs = [pkgconfig gtk perl perlXMLParser gettext];
}

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

@ -1,6 +1,6 @@
{ 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, intltool
, enableCompositor ? false , enableCompositor ? false
, libXcomposite ? null, libXfixes ? null, libXdamage ? null, libcm ? null , libXcomposite ? null, libXfixes ? null, libXdamage ? null, libcm ? null
@ -14,11 +14,11 @@ stdenv.mkDerivation {
buildInputs = [ buildInputs = [
pkgconfig perl perlXMLParser glib gtk GConf startupnotification pkgconfig perl perlXMLParser glib gtk GConf startupnotification
libXinerama libXrandr libXcursor gettext libXinerama libXrandr libXcursor gettext intltool
] ]
++ (if enableCompositor then [libXcomposite libXfixes libXdamage libcm] else []); ++ stdenv.lib.optionals enableCompositor [libXcomposite libXfixes libXdamage libcm];
configureFlags = " configureFlags = ''
${if enableCompositor then "--enable-compositor" else ""} ${if enableCompositor then "--enable-compositor" else ""}
"; '';
} }

13
pkgs/desktops/gnome/vte.nix
View File

@ -1,13 +0,0 @@
{ input, stdenv, fetchurl, gnome, pkgconfig, perl, perlXMLParser
, ncurses, python, gettext
}:
stdenv.mkDerivation {
inherit (input) name src;
buildInputs = [
pkgconfig perl perlXMLParser gnome.glib gnome.gtk python gettext
];
propagatedBuildInputs = [ncurses];
}