From 213fff3ca0ca86500fe4cfcdb7378983d5963c86 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 27 Apr 2009 23:01:20 +0000 Subject: [PATCH] * Updated HAL to 0.5.11. Passed gperf and patched a Makefile to ensure that it installs policy/10osvendor/10-keymap.fdi, which the evdev driver in X.org relies on. svn path=/nixpkgs/trunk/; revision=15342 --- pkgs/os-specific/linux/hal/default.nix | 22 +++++++++++++--------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/pkgs/os-specific/linux/hal/default.nix b/pkgs/os-specific/linux/hal/default.nix index c7cde0e96cfc..a458a8af7160 100644 --- a/pkgs/os-specific/linux/hal/default.nix +++ b/pkgs/os-specific/linux/hal/default.nix @@ -1,32 +1,36 @@ args: with args; -stdenv.mkDerivation { - name = "hal-0.5.10"; +stdenv.mkDerivation rec { + name = "hal-0.5.11"; src = fetchurl { - url = http://hal.freedesktop.org/releases/hal-0.5.10.tar.gz; - sha256 = "0k6bgavkry7sl1wwpwfpk15r52b75gfql2qgyijaqaxg826a2was"; + url = "http://hal.freedesktop.org/releases/${name}.tar.gz"; + sha256 = "145s20fzb4gaqxmv3r6i29ndwgnap95ric63n1z6g2gp80iry2kk"; }; buildInputs = [ pkgconfig python pciutils expat libusb dbus.libs dbus_glib glib - libvolume_id perl perlXMLParser gettext zlib libsmbios + libvolume_id perl perlXMLParser gettext zlib libsmbios gperf + # !!! libsmbios is broken; it doesn't install headers. ]; # !!! 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. - configureFlags = " + configureFlags = '' --with-pci-ids=${pciutils}/share --with-usb-ids=${usbutils}/share --disable-docbook-docs --disable-gtk-doc --localstatedir=/var --with-eject=${eject}/bin/eject - "; + --disable-policy-kit + ''; propagatedBuildInputs = [libusb]; - preBuild = " + preConfigure = '' substituteInPlace hald/linux/coldplug.c --replace /usr/bin/udevinfo ${udev}/bin/udevinfo - "; + + substituteInPlace tools/Makefile.in --replace /usr/include ${stdenv.glibc}/include + ''; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 62215165e8f3..dd29f293e284 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4609,7 +4609,7 @@ let hal = import ../os-specific/linux/hal { inherit fetchurl stdenv pkgconfig python pciutils usbutils expat libusb dbus dbus_glib libvolume_id perl perlXMLParser - gettext zlib eject libsmbios udev; + gettext zlib eject libsmbios udev gperf; inherit (gtkLibs) glib; };