nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-31 09:14:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Updated HAL to 0.5.11. Passed gperf and patched a Makefile to

Browse Source 
ensure that it installs policy/10osvendor/10-keymap.fdi, which the
  evdev driver in X.org relies on.

svn path=/nixpkgs/trunk/; revision=15342
This commit is contained in:
Eelco Dolstra 2009-04-27 23:01:20 +00:00
parent 5703b08f47
commit 213fff3ca0
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,32 +1,36 @@
args: with args; args: with args;
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "hal-0.5.10"; name = "hal-0.5.11";
src = fetchurl { src = fetchurl {
url = http://hal.freedesktop.org/releases/hal-0.5.10.tar.gz; url = "http://hal.freedesktop.org/releases/${name}.tar.gz";
sha256 = "0k6bgavkry7sl1wwpwfpk15r52b75gfql2qgyijaqaxg826a2was"; sha256 = "145s20fzb4gaqxmv3r6i29ndwgnap95ric63n1z6g2gp80iry2kk";
}; };
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 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 # !!! 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.
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-docbook-docs
--disable-gtk-doc --disable-gtk-doc
--localstatedir=/var --localstatedir=/var
--with-eject=${eject}/bin/eject --with-eject=${eject}/bin/eject
"; --disable-policy-kit
'';
propagatedBuildInputs = [libusb]; propagatedBuildInputs = [libusb];
preBuild = " preConfigure = ''
substituteInPlace hald/linux/coldplug.c --replace /usr/bin/udevinfo ${udev}/bin/udevinfo substituteInPlace hald/linux/coldplug.c --replace /usr/bin/udevinfo ${udev}/bin/udevinfo
";
substituteInPlace tools/Makefile.in --replace /usr/include ${stdenv.glibc}/include
'';
} }

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

@ -4609,7 +4609,7 @@ 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 libvolume_id perl perlXMLParser
gettext zlib eject libsmbios udev; gettext zlib eject libsmbios udev gperf;
inherit (gtkLibs) glib; inherit (gtkLibs) glib;
}; };