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

* HAL needs udev. 

svn path=/nixpkgs/trunk/; revision=8853
This commit is contained in:
Eelco Dolstra 2007-06-09 19:47:20 +00:00
parent fffe4c7900
commit 9c5cab8852
2 changed files with 7 additions and 13 deletions
pkgs
os-specific/linux/hal
default.nix
top-level
all-packages.nix

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

@ -1,6 +1,7 @@
{ stdenv, fetchurl, pkgconfig, python, pciutils, usbutils, expat { stdenv, fetchurl, pkgconfig, python, pciutils, usbutils, expat
, libusb, dbus, dbus_glib, glib, libvolume_id, perl, perlXMLParser , libusb, dbus, dbus_glib, glib, libvolume_id, perl, perlXMLParser
, gettext, zlib /* required by pciutils */, eject, libsmbios , gettext, zlib /* required by pciutils */, eject, libsmbios
, udev
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -19,22 +20,15 @@ stdenv.mkDerivation {
# !!! 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/pci.ids --with-pci-ids=${pciutils}/share
--with-usb-ids=${usbutils}/share/usb.ids --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
"; ";
/* preBuild = "
preInstall = " substituteInPlace hald/linux/coldplug.c --replace /usr/bin/udevinfo ${udev}/bin/udevinfo
installFlagsArray=(DESTDIR=$out/destdir)
"; ";
postInstall = "
mv $out/destdir/$out/* $out
rm -rf $out/destdir
";
*/
} }

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

@ -218,7 +218,7 @@ rec {
# Write a plain text file to the Nix store. (The advantage over # Write a plain text file to the Nix store. (The advantage over
# plain sources is that `text' can refer to the output paths of # plain sources is that `text' can refer to the output paths of
# derivations, e.g., "... ${somePkg}/bin/foo ...". # derivations, e.g., "... ${somePkg}/bin/foo ...".
writeText = name: text: runCommand name {inherit text;} "echo \"$text\" > $out"; writeText = name: text: runCommand name {inherit text;} "echo -n \"$text\" > $out";
substituteAll = import ../build-support/substitute/substitute-all.nix { substituteAll = import ../build-support/substitute/substitute-all.nix {
inherit stdenv; inherit stdenv;
@ -2233,7 +2233,7 @@ rec {
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; gettext zlib eject libsmbios udev;
inherit (gtkLibs) glib; inherit (gtkLibs) glib;
}; };