* Latest libsmbios.

* Build HAL with libsmbios support.

svn path=/nixpkgs/trunk/; revision=17472

pkgs/os-specific/linux/hal/default.nix

@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     pkgconfig python pciutils expat libusb dbus.libs dbus_glib glib
     libuuid perl perlXMLParser gettext zlib gperf
-    consolekit policykit
+    consolekit policykit libsmbios
     # !!! libsmbios is broken; it doesn't install headers.
   ];
 

pkgs/os-specific/linux/libsmbios/default.nix

@@ -1,17 +1,28 @@
-{stdenv, fetchurl, libxml2}:
+{ stdenv, fetchurl, pkgconfig, libxml2, perl }:
 
 stdenv.mkDerivation rec {
-  name = "libsmbios-2.0.3";
-  
+  name = "libsmbios-2.2.19";
+
   src = fetchurl {
     url = "http://linux.dell.com/libsmbios/download/libsmbios/${name}/${name}.tar.gz";
-    sha256 = "1mgabn7r8pzi9f7zb4pvlmfm8jmrz1dcijz6nckvcnzxxi02pv4c";
+    sha256 = "0f4wnjml734ssg583r448ypax7vf3f9n8gybzvzg170lc3byayhv";
   };
   
-  buildInputs = [libxml2];
-  
+  buildInputs = [ pkgconfig libxml2 perl ];
+
+  # It tries to install some Python stuff even when Python is disabled.
+  installFlags = "pkgpythondir=$(TMPDIR)/python";
+
+  # It forgets to install headers.
+  postInstall =
+    ''
+      cp -a src/include/* $out/include
+      cp -a out/public-include/* $out/include
+    ''; # */
+
   meta = {
     homepage = http://linux.dell.com/libsmbios/main/index.html;
     description = "A library to obtain BIOS information";
+    license = "GPLv2+"; # alternatively, under the Open Software License version 2.1
   };
 }

pkgs/top-level/all-packages.nix

@@ -5637,7 +5637,7 @@ let
   };
 
   libsmbios = import ../os-specific/linux/libsmbios {
-    inherit fetchurl stdenv libxml2;
+    inherit fetchurl stdenv pkgconfig libxml2 perl;
   };
 
   lm_sensors = import ../os-specific/linux/lm_sensors {