diff options
Diffstat (limited to 'pkgs/desktops/gnome')
-rw-r--r-- | pkgs/desktops/gnome/default.nix | 6 | ||||
-rw-r--r-- | pkgs/desktops/gnome/libbonobo.nix | 10 | ||||
-rw-r--r-- | pkgs/desktops/gnome/libgnome.nix | 4 | ||||
-rw-r--r-- | pkgs/desktops/gnome/libgnomeui.nix | 3 |
4 files changed, 16 insertions, 7 deletions
diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index b74662db96108..708e2b5a82d70 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -78,7 +78,7 @@ rec { libgnome = import ./libgnome.nix { inherit fetchurl stdenv gnome pkgconfig perl perlXMLParser - popt zlib esound gettext; + popt zlib esound gettext intltool; input = platform.libgnome; }; @@ -102,7 +102,9 @@ rec { }; 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; input = platform.libbonobo; }; diff --git a/pkgs/desktops/gnome/libbonobo.nix b/pkgs/desktops/gnome/libbonobo.nix index 5a4bdf5f95809..0b7d949247e8b 100644 --- a/pkgs/desktops/gnome/libbonobo.nix +++ b/pkgs/desktops/gnome/libbonobo.nix @@ -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 && 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 stdenv.mkDerivation { 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]; } diff --git a/pkgs/desktops/gnome/libgnome.nix b/pkgs/desktops/gnome/libgnome.nix index 2ac05487cf8e1..9a34009834ffa 100644 --- a/pkgs/desktops/gnome/libgnome.nix +++ b/pkgs/desktops/gnome/libgnome.nix @@ -1,5 +1,5 @@ { input, stdenv, fetchurl, gnome, pkgconfig, perl, perlXMLParser -, popt, zlib, esound, gettext +, popt, zlib, esound, gettext, intltool }: # !!! TODO CHECK: @@ -9,6 +9,6 @@ stdenv.mkDerivation { 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]; } diff --git a/pkgs/desktops/gnome/libgnomeui.nix b/pkgs/desktops/gnome/libgnomeui.nix index 3d014349dd9b4..3e56a44198a2f 100644 --- a/pkgs/desktops/gnome/libgnomeui.nix +++ b/pkgs/desktops/gnome/libgnomeui.nix @@ -1,11 +1,12 @@ { input, stdenv, fetchurl, gnome, pkgconfig, perl, perlXMLParser -, esound, libjpeg, gettext +, esound, libjpeg, gettext, intltool }: stdenv.mkDerivation { inherit (input) name src; buildInputs = [ pkgconfig perl perlXMLParser gnome.libglade esound libjpeg gettext + intltool ]; propagatedBuildInputs = [ gnome.libgnome gnome.libgnomecanvas gnome.libbonoboui libjpeg |