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

* hal: updated to 0.5.13.

Browse Source 
* hal-info: updated to 20090716.

svn path=/nixpkgs/trunk/; revision=16686
This commit is contained in:
Eelco Dolstra 2009-08-11 21:03:53 +00:00
parent d66fd6e36b
commit a63c9c8e71
3 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/os-specific/linux/hal/default.nix
View File

@ -3,16 +3,16 @@ args: with args;
assert stdenv ? glibc; assert stdenv ? glibc;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "hal-0.5.11"; name = "hal-0.5.13";
src = fetchurl { src = fetchurl {
url = "http://hal.freedesktop.org/releases/${name}.tar.gz"; url = "http://hal.freedesktop.org/releases/${name}.tar.gz";
sha256 = "145s20fzb4gaqxmv3r6i29ndwgnap95ric63n1z6g2gp80iry2kk"; sha256 = "1by8z7vy1c1m3iyh57rlqx6rah5gj6kx3ba30s9305bnffij5kzb";
}; };
buildInputs = [ buildInputs = [
pkgconfig python pciutils expat libusb dbus.libs dbus_glib glib pkgconfig python pciutils expat libusb dbus.libs dbus_glib glib
libvolume_id perl perlXMLParser gettext zlib libsmbios gperf libuuid perl perlXMLParser gettext zlib gperf
# !!! libsmbios is broken; it doesn't install headers. # !!! libsmbios is broken; it doesn't install headers.
]; ];
@ -21,18 +21,21 @@ stdenv.mkDerivation rec {
configureFlags = '' configureFlags = ''
--with-pci-ids=${pciutils}/share --with-pci-ids=${pciutils}/share
--with-usb-ids=${usbutils}/share --with-usb-ids=${usbutils}/share
--disable-docbook-docs
--disable-gtk-doc
--localstatedir=/var --localstatedir=/var
--with-eject=${eject}/bin/eject --with-eject=${eject}/bin/eject
--with-linux-input-header=${stdenv.glibc}/include/linux/input.h
--disable-policy-kit --disable-policy-kit
''; '';
propagatedBuildInputs = [libusb]; propagatedBuildInputs = [libusb libsmbios];
preConfigure = '' preConfigure = ''
substituteInPlace hald/linux/coldplug.c --replace /usr/bin/udevinfo ${udev}/bin/udevinfo for i in hald/linux/probing/probe-smbios.c hald/linux/osspec.c \
hald/linux/coldplug.c hald/linux/blockdev.c
substituteInPlace tools/Makefile.in --replace /usr/include ${stdenv.glibc}/include do
substituteInPlace $i \
--replace /usr/sbin/dmidecode ${dmidecode}/sbin/dmidecode \
--replace /sbin/udevadm ${udev}/sbin/udevadm
done
''; '';
} }

8
pkgs/os-specific/linux/hal/info.nix
View File

@ -1,15 +1,13 @@
{stdenv, fetchurl, pkgconfig, hal}: {stdenv, fetchurl, pkgconfig}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "hal-info-20090414"; name = "hal-info-20090716";
src = fetchurl { src = fetchurl {
url = "http://hal.freedesktop.org/releases/${name}.tar.gz"; url = "http://hal.freedesktop.org/releases/${name}.tar.gz";
sha256 = "03zsh4psq189k7i8mwazsmallwc10naavkdrp1sp68jjjkf8gp9k"; sha256 = "179m2ip79jpr1mrmbcm2nx7l1mjlwcfmlw4ycd4dh0jrib64m3sp";
}; };
buildInputs = [pkgconfig hal];
meta = { meta = {
homepage = http://www.freedesktop.org/wiki/Software/hal; homepage = http://www.freedesktop.org/wiki/Software/hal;
description = "Hardware data and quirks for HAL"; description = "Hardware data and quirks for HAL";

6
pkgs/top-level/all-packages.nix
View File

@ -4761,13 +4761,13 @@ let
hal = import ../os-specific/linux/hal { hal = import ../os-specific/linux/hal {
inherit fetchurl stdenv pkgconfig python pciutils usbutils expat inherit fetchurl stdenv pkgconfig python pciutils usbutils expat
libusb dbus dbus_glib libvolume_id perl perlXMLParser libusb dbus dbus_glib libuuid perl perlXMLParser
gettext zlib eject libsmbios udev gperf; gettext zlib eject libsmbios udev gperf dmidecode;
inherit (gtkLibs) glib; inherit (gtkLibs) glib;
}; };
hal_info = import ../os-specific/linux/hal/info.nix { hal_info = import ../os-specific/linux/hal/info.nix {
inherit fetchurl stdenv pkgconfig hal; inherit fetchurl stdenv pkgconfig;
}; };
hdparm = import ../os-specific/linux/hdparm { hdparm = import ../os-specific/linux/hdparm {