public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Limitting the 'hal' usage of libsmbios to i686/x86_64

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23320
This commit is contained in:
Lluís Batlle i Rossell 2010-08-21 17:11:07 +00:00
parent 64eadafc2b
commit affd2abf24
1 changed files with 2 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

@ -19,8 +19,7 @@ stdenv.mkDerivation rec {
pkgconfig python pciutils expat libusb dbus.libs dbus_glib glib pkgconfig python pciutils expat libusb dbus.libs dbus_glib glib
libuuid perl perlXMLParser gettext zlib gperf libuuid perl perlXMLParser gettext zlib gperf
consolekit policykit 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 # !!! 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. # we don't have to rebuild HAL when we update the PCI/USB IDs.
@ -34,7 +33,7 @@ stdenv.mkDerivation rec {
''; '';
propagatedBuildInputs = [ libusb ] propagatedBuildInputs = [ libusb ]
++ stdenv.lib.optionals (stdenv.system != "armv5tel-linux") [ libsmbios ]; ++ stdenv.lib.optional (stdenv.isi686 || stdenv.isx86_64) [ libsmbios ];
preConfigure = '' preConfigure = ''
for i in hald/linux/probing/probe-smbios.c hald/linux/osspec.c \ for i in hald/linux/probing/probe-smbios.c hald/linux/osspec.c \