ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-29 06:45:54 +03:00
Code Issues Projects Releases Wiki Activity

Upgrade to udev-153. Use /etc/firmware:/root/test-firmware path

Browse Source 
svn path=/nixpkgs/trunk/; revision=21781
This commit is contained in:
Yury G. Kudryashov 2010-05-15 09:54:35 +00:00
parent e69bf4f278
commit 82201f14e9
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkgs/os-specific/linux/udev/default.nix
View File

@ -4,29 +4,23 @@
assert stdenv ? glibc; assert stdenv ? glibc;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "udev-145"; name = "udev-153";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/utils/kernel/hotplug/${name}.tar.bz2"; url = "mirror://kernel/linux/utils/kernel/hotplug/${name}.tar.bz2";
sha256 = "1zmibp6n7d582fqx8vmg9vb2a1435hghfpz36056bc25ccwf7yiv"; sha256 = "0i3ns4qhfbnci284k8zri0rfxw88ccajdynb5djh6k182a6nn3la";
}; };
buildInputs = [gperf pkgconfig glib acl libusb usbutils]; buildInputs = [gperf pkgconfig glib acl libusb usbutils];
configureFlags = "--with-pci-ids-path=${pciutils}/share/pci.ids"; configureFlags = "--with-pci-ids-path=${pciutils}/share/pci.ids
--disable-introspection
preConfigure = --with-firmware-path=/etc/firmware:/root/test-firmware";
''
substituteInPlace extras/keymap/Makefile.in \
--replace /usr/include ${stdenv.glibc}/include
'';
postInstall = postInstall =
'' ''
# Install some rules that really should be installed by default. # Install some rules that really should be installed by default.
for i in 40-alsa.rules 40-infiniband.rules 40-isdn.rules 40-pilot-links.rules 64-device-mapper.rules 64-md-raid.rules; do cp rules/packages/40-pilot-links.rules $out/libexec/rules.d/
cp rules/packages/$i $out/libexec/rules.d/
done
# The path to rule_generator.functions in write_cd_rules and # The path to rule_generator.functions in write_cd_rules and
# write_net_rules is broken. Also, don't store the mutable # write_net_rules is broken. Also, don't store the mutable
@ -39,12 +33,7 @@ stdenv.mkDerivation rec {
done done
# Don't set PATH to /bin:/sbin; won't work in NixOS. # Don't set PATH to /bin:/sbin; won't work in NixOS.
substituteInPlace $out/libexec/rule_generator.functions \ sed -e '/PATH=/d' -i $out/libexec/rule_generator.functions
--replace 'PATH=' '#PATH='
# Don't hardcore the FIRMWARE_DIRS variable; obtain it from the
# environment of the caller.
sed '3,4d' -i $out/libexec/firmware.sh
ln -s $out/lib/ConsoleKit $out/etc/ConsoleKit ln -s $out/lib/ConsoleKit $out/etc/ConsoleKit
''; '';