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

Removing dmidecode on non-PC platforms for HAL

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23496
This commit is contained in:
Lluís Batlle i Rossell 2010-08-29 10:00:37 +00:00
parent 9fa49630a2
commit e8d6adbf3c
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,12 @@
assert stdenv ? glibc; assert stdenv ? glibc;
let
isPC = stdenv.isi686 || stdenv.isx86_64;
changeDmidecode = if isPC then
"--replace /usr/sbin/dmidecode ${dmidecode}/sbin/dmidecode"
else "";
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "hal-0.5.14"; name = "hal-0.5.14";
@ -33,7 +39,7 @@ stdenv.mkDerivation rec {
''; '';
propagatedBuildInputs = [ libusb ] propagatedBuildInputs = [ libusb ]
++ stdenv.lib.optional (stdenv.isi686 || stdenv.isx86_64) [ libsmbios ]; ++ stdenv.lib.optional isPC [ libsmbios ];
preConfigure = '' preConfigure = ''
for i in hald/linux/probing/probe-smbios.c hald/linux/osspec.c \ for i in hald/linux/probing/probe-smbios.c hald/linux/osspec.c \
@ -43,7 +49,7 @@ stdenv.mkDerivation rec {
tools/linux/hal-*-linux tools/linux/hal-*-linux
do do
substituteInPlace $i \ substituteInPlace $i \
--replace /usr/sbin/dmidecode ${dmidecode}/sbin/dmidecode \ ${changeDmidecode} \
${if udev != null then "--replace /sbin/udevadm ${udev}/sbin/udevadm" else ""} \ ${if udev != null then "--replace /sbin/udevadm ${udev}/sbin/udevadm" else ""} \
--replace /bin/mount ${utillinuxng}/bin/mount \ --replace /bin/mount ${utillinuxng}/bin/mount \
--replace /bin/umount ${utillinuxng}/bin/umount \ --replace /bin/umount ${utillinuxng}/bin/umount \