diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index a3f8d4a9c05..014a99b674a 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -1,12 +1,6 @@ # todo audiofile is also part of the gnome platform. Move it to this collection? -{ stdenv, fetchurl, pkgconfig, audiofile -, flex, bison, popt, perl, zlib, libxml2, libxslt -, perlXMLParser, docbook_xml_dtd_42, docbook_xml_dtd_412 -, gettext, x11, libtiff, libjpeg -, libpng, gtkLibs, xlibs, bzip2, libcm, python, dbus_glib, ncurses -, which, libxml2Python, iconnamingutils -}: +args: with args; assert dbus_glib.glib == gtkLibs.glib; @@ -57,7 +51,7 @@ rec { gnomevfs = import ./gnome-vfs.nix { inherit fetchurl stdenv gnome pkgconfig perl libxml2 popt - perlXMLParser gettext bzip2 dbus_glib; + perlXMLParser gettext bzip2 dbus_glib openssl hal samba fam; input = platform.gnomevfs; }; diff --git a/pkgs/desktops/gnome/gnome-vfs.nix b/pkgs/desktops/gnome/gnome-vfs.nix index b374ad4d94d..24b99fb3b83 100644 --- a/pkgs/desktops/gnome/gnome-vfs.nix +++ b/pkgs/desktops/gnome/gnome-vfs.nix @@ -1,14 +1,11 @@ -{ input, stdenv, fetchurl, gnome, pkgconfig, perl, libxml2 -, popt, perlXMLParser, gettext, bzip2, dbus_glib -}: +args: with args; stdenv.mkDerivation { inherit (input) name src; buildInputs = [ pkgconfig perl gnome.glib libxml2 gnome.GConf gnome.libbonobo gnome.gnomemimedata popt perlXMLParser gettext bzip2 - dbus_glib + dbus_glib hal openssl samba fam ]; patches = [./no-kerberos.patch]; - configureFlags = "--disable-hal"; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 110c8cf713d..ddde745fe45 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4930,7 +4930,7 @@ rec { perl perlXMLParser docbook_xml_dtd_42 docbook_xml_dtd_412 gettext x11 libtiff libjpeg libpng gtkLibs xlibs bzip2 libcm python dbus_glib ncurses which libxml2Python - iconnamingutils; + iconnamingutils openssl hal samba fam; }); kdelibs = import ../desktops/kde/kdelibs {