From affd2abf24791799cd4926d16e8f40979122de49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 21 Aug 2010 17:11:07 +0000 Subject: [PATCH] Limitting the 'hal' usage of libsmbios to i686/x86_64 svn path=/nixpkgs/branches/stdenv-updates/; revision=23320 --- pkgs/os-specific/linux/hal/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/hal/default.nix b/pkgs/os-specific/linux/hal/default.nix index 2f830ab0131a..055bb2ab0cdc 100644 --- a/pkgs/os-specific/linux/hal/default.nix +++ b/pkgs/os-specific/linux/hal/default.nix @@ -19,8 +19,7 @@ stdenv.mkDerivation rec { pkgconfig python pciutils expat libusb dbus.libs dbus_glib glib libuuid perl perlXMLParser gettext zlib gperf consolekit policykit - # !!! libsmbios is broken; it doesn't install headers. - ] ++ stdenv.lib.optional (stdenv.system != "armv5tel-linux") [ libsmbios ]; + ]; # !!! Hm, maybe the pci/usb.ids location should be in /etc, so that # we don't have to rebuild HAL when we update the PCI/USB IDs. @@ -34,7 +33,7 @@ stdenv.mkDerivation rec { ''; propagatedBuildInputs = [ libusb ] - ++ stdenv.lib.optionals (stdenv.system != "armv5tel-linux") [ libsmbios ]; + ++ stdenv.lib.optional (stdenv.isi686 || stdenv.isx86_64) [ libsmbios ]; preConfigure = '' for i in hald/linux/probing/probe-smbios.c hald/linux/osspec.c \