diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-06-07 22:02:12 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-06-07 22:02:12 +0000 |
commit | cb3b10a6461b01c9015a11a81721031746238203 (patch) | |
tree | 230aec5d20f690ea9943e743f49d380bf6cc4fe3 /pkgs | |
parent | 42c246ec16b07fbecbb87922669920500602c735 (diff) | |
download | nixlib-cb3b10a6461b01c9015a11a81721031746238203.tar nixlib-cb3b10a6461b01c9015a11a81721031746238203.tar.gz nixlib-cb3b10a6461b01c9015a11a81721031746238203.tar.bz2 nixlib-cb3b10a6461b01c9015a11a81721031746238203.tar.lz nixlib-cb3b10a6461b01c9015a11a81721031746238203.tar.xz nixlib-cb3b10a6461b01c9015a11a81721031746238203.tar.zst nixlib-cb3b10a6461b01c9015a11a81721031746238203.zip |
* Added libsmbios for access to Dell-specific hardware features.
* Added more optional Hal dependencies. svn path=/nixpkgs/trunk/; revision=8844
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/os-specific/linux/hal/default.nix | 5 | ||||
-rw-r--r-- | pkgs/os-specific/linux/libsmbios/default.nix | 17 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
3 files changed, 25 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/hal/default.nix b/pkgs/os-specific/linux/hal/default.nix index 8bc741480377..93ba4ea4f189 100644 --- a/pkgs/os-specific/linux/hal/default.nix +++ b/pkgs/os-specific/linux/hal/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, python, pciutils, usbutils, expat , libusb, dbus, dbus_glib, glib, libvolume_id, perl, perlXMLParser -, gettext +, gettext, zlib /* required by pciutils */, eject, libsmbios }: stdenv.mkDerivation { @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ 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 @@ -24,6 +24,7 @@ stdenv.mkDerivation { --disable-docbook-docs --disable-gtk-doc --localstatedir=/var + --with-eject=${eject}/bin/eject "; /* diff --git a/pkgs/os-specific/linux/libsmbios/default.nix b/pkgs/os-specific/linux/libsmbios/default.nix new file mode 100644 index 000000000000..87737bd28ccc --- /dev/null +++ b/pkgs/os-specific/linux/libsmbios/default.nix @@ -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/ + "; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3454333d8efe..b9618d82552c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2233,7 +2233,7 @@ rec { hal = import ../os-specific/linux/hal { inherit fetchurl stdenv pkgconfig python pciutils usbutils expat libusb dbus dbus_glib libvolume_id perl perlXMLParser - gettext; + gettext zlib eject libsmbios; inherit (gtkLibs) glib; }; @@ -2364,6 +2364,10 @@ rec { inherit fetchurl stdenv; }; + libsmbios = import ../os-specific/linux/libsmbios { + inherit fetchurl stdenv libxml2; + }; + klibc = import ../os-specific/linux/klibc { inherit fetchurl stdenv perl bison mktemp kernel; }; |