ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-22 04:57:56 +03:00
Code Issues Projects Releases Wiki Activity

gnome-vfs: added hal, ssl and samba

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10468
This commit is contained in:
Yury G. Kudryashov 2008-02-02 20:43:11 +00:00
parent c0496c0413
commit d9d342749a
3 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;
};

7
pkgs/desktops/gnome/gnome-vfs.nix
View File

@ -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";
}

2
pkgs/top-level/all-packages.nix
View File

@ -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 {