alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

* Added libsmbios for access to Dell-specific hardware features.

Browse source 
* Added more optional Hal dependencies.

svn path=/nixpkgs/trunk/; revision=8844
This commit is contained in:
Eelco Dolstra 2007-06-07 22:02:12 +00:00
parent 42c246ec16
commit cb3b10a646
3 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/os-specific/linux/hal/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, python, pciutils, usbutils, expat { stdenv, fetchurl, pkgconfig, python, pciutils, usbutils, expat
, libusb, dbus, dbus_glib, glib, libvolume_id, perl, perlXMLParser , libusb, dbus, dbus_glib, glib, libvolume_id, perl, perlXMLParser
, gettext , gettext, zlib /* required by pciutils */, eject, libsmbios
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -13,7 +13,7 @@ stdenv.mkDerivation {
buildInputs = [ buildInputs = [
pkgconfig python pciutils expat libusb dbus dbus_glib glib pkgconfig python pciutils expat libusb dbus dbus_glib glib
libvolume_id perl perlXMLParser gettext libvolume_id perl perlXMLParser gettext zlib libsmbios
]; ];
# !!! Hm, maybe the pci/usb.ids location should be in /etc, so that # !!! Hm, maybe the pci/usb.ids location should be in /etc, so that
@ -24,6 +24,7 @@ stdenv.mkDerivation {
--disable-docbook-docs --disable-docbook-docs
--disable-gtk-doc --disable-gtk-doc
--localstatedir=/var --localstatedir=/var
--with-eject=${eject}/bin/eject
"; ";
/* /*

17
pkgs/os-specific/linux/libsmbios/default.nix Normal file
View file

@ -0,0 +1,17 @@
{stdenv, fetchurl, libxml2}:
stdenv.mkDerivation {
name = "libsmbios-0.13.6";
src = fetchurl {
url = http://linux.dell.com/libsmbios/download/libsmbios/libsmbios-0.13.6/libsmbios-0.13.6.tar.gz;
sha256 = "0zjch3xzyr289x64wzaj67l4jj0x645krxmx4yqn18hp2innfffs";
};
buildInputs = [libxml2];
configureFlags = "--disable-static"; # bloated enough as it is...
# `make install' forgets to install the header files.
postInstall = "
ensureDir $out/include
cp -prvd include/smbios $out/include/
";
}

6
pkgs/top-level/all-packages.nix
View file

@ -2233,7 +2233,7 @@ rec {
hal = import ../os-specific/linux/hal { hal = import ../os-specific/linux/hal {
inherit fetchurl stdenv pkgconfig python pciutils usbutils expat inherit fetchurl stdenv pkgconfig python pciutils usbutils expat
libusb dbus dbus_glib libvolume_id perl perlXMLParser libusb dbus dbus_glib libvolume_id perl perlXMLParser
gettext; gettext zlib eject libsmbios;
inherit (gtkLibs) glib; inherit (gtkLibs) glib;
}; };
@ -2364,6 +2364,10 @@ rec {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
libsmbios = import ../os-specific/linux/libsmbios {
inherit fetchurl stdenv libxml2;
};
klibc = import ../os-specific/linux/klibc { klibc = import ../os-specific/linux/klibc {
inherit fetchurl stdenv perl bison mktemp kernel; inherit fetchurl stdenv perl bison mktemp kernel;
}; };