diff options
Diffstat (limited to 'pkgs/desktops/gnome-2')
7 files changed, 15 insertions, 15 deletions
diff --git a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix index 34dfaa85b2f39..df63449c2f61f 100644 --- a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config intltool ] ++ lib.optionals stdenv.isDarwin [ autoreconfHook ]; buildInputs = [ atk cairo glib gtk2 - pango libxml2Python perl intltool + pango libxml2Python perl gettext ] ++ optionals stdenv.isDarwin [ - autoreconfHook gnome-common gtk-mac-integration-gtk2 + gnome-common gtk-mac-integration-gtk2 ]; preConfigure = optionalString stdenv.isDarwin '' diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix index 580d0a8cc8296..72422cf41c35a 100644 --- a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix +++ b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ gsettings-desktop-schemas gtk3 gnome-icon-theme GConf ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ intltool enchant isocodes autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook intltool ]; + buildInputs = [ enchant isocodes ]; } diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix b/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix index 4f4e0503f819b..206494e70224b 100644 --- a/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { #http://www.mail-archive.com/debian-bugs-rc@lists.debian.org/msg250091.html patches = [ ./01_remove-disable-deprecated.patch ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2 intltool GConf enchant isocodes gnome-icon-theme ]; + nativeBuildInputs = [ pkg-config intltool ]; + buildInputs = [ gtk2 GConf enchant isocodes gnome-icon-theme ]; NIX_LDFLAGS = "-lgthread-2.0"; } diff --git a/pkgs/desktops/gnome-2/platform/libgnome/default.nix b/pkgs/desktops/gnome-2/platform/libgnome/default.nix index 2c70338a9005a..56145980a5d26 100644 --- a/pkgs/desktops/gnome-2/platform/libgnome/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnome/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ popt zlib intltool GConf gnome_vfs libcanberra-gtk2 libtool ]; + nativeBuildInputs = [ pkg-config intltool ]; + buildInputs = [ popt zlib GConf gnome_vfs libcanberra-gtk2 libtool ]; propagatedBuildInputs = [ glib libbonobo libogg ]; } diff --git a/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix index 42de8c2471a3b..8d6bcce60205c 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { patches = [ ./glib.patch ./cups_1.6.patch ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2 gettext intltool libart_lgpl ]; + nativeBuildInputs = [ pkg-config intltool ]; + buildInputs = [ gtk2 gettext libart_lgpl ]; propagatedBuildInputs = [ libxml2 ]; } diff --git a/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix index bb2e435f422d0..5f7a254c8fbdd 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2 gettext intltool libart_lgpl libgnomecups bison flex ]; + nativeBuildInputs = [ pkg-config intltool ]; + buildInputs = [ gtk2 gettext libart_lgpl libgnomecups bison flex ]; propagatedBuildInputs = [ libxml2 ]; diff --git a/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix index a95ee70bca107..f8a647a5b5a5f 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix @@ -9,6 +9,6 @@ stdenv.mkDerivation rec { sha256 = "0spl8vinb5n6n1krnfnr61dwaxidg67h8j94z9p59k2xdsvfashm"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2 gettext intltool libgnomecanvas libgnomeprint gnome-icon-theme]; + nativeBuildInputs = [ pkg-config intltool ]; + buildInputs = [ gtk2 gettext libgnomecanvas libgnomeprint gnome-icon-theme]; } |