From 06e126b48f9bdc11def0cc48f0ac724ec22cc9a6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 28 Sep 2009 15:33:42 +0000
Subject: * Latest libsmbios. * Build HAL with libsmbios support.

svn path=/nixpkgs/trunk/; revision=17472
---
 pkgs/os-specific/linux/hal/default.nix       |  2 +-
 pkgs/os-specific/linux/libsmbios/default.nix | 23 +++++++++++++++++------
 2 files changed, 18 insertions(+), 7 deletions(-)

(limited to 'pkgs/os-specific/linux')

diff --git a/pkgs/os-specific/linux/hal/default.nix b/pkgs/os-specific/linux/hal/default.nix
index b5962398befee..1cce0334dc270 100644
--- a/pkgs/os-specific/linux/hal/default.nix
+++ b/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.
   ];
 
diff --git a/pkgs/os-specific/linux/libsmbios/default.nix b/pkgs/os-specific/linux/libsmbios/default.nix
index 567463cf3fb8d..41b440a48985d 100644
--- a/pkgs/os-specific/linux/libsmbios/default.nix
+++ b/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
   };
 }
-- 
cgit 1.4.1