From e8d6adbf3c1e51bac3568753fb6a21db445c4394 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 29 Aug 2010 10:00:37 +0000 Subject: [PATCH] Removing dmidecode on non-PC platforms for HAL svn path=/nixpkgs/branches/stdenv-updates/; revision=23496 --- pkgs/os-specific/linux/hal/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/hal/default.nix b/pkgs/os-specific/linux/hal/default.nix index 055bb2ab0cd..515285d6401 100644 --- a/pkgs/os-specific/linux/hal/default.nix +++ b/pkgs/os-specific/linux/hal/default.nix @@ -7,6 +7,12 @@ 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 { name = "hal-0.5.14"; @@ -33,7 +39,7 @@ stdenv.mkDerivation rec { ''; propagatedBuildInputs = [ libusb ] - ++ stdenv.lib.optional (stdenv.isi686 || stdenv.isx86_64) [ libsmbios ]; + ++ stdenv.lib.optional isPC [ libsmbios ]; preConfigure = '' for i in hald/linux/probing/probe-smbios.c hald/linux/osspec.c \ @@ -43,7 +49,7 @@ stdenv.mkDerivation rec { tools/linux/hal-*-linux do substituteInPlace $i \ - --replace /usr/sbin/dmidecode ${dmidecode}/sbin/dmidecode \ + ${changeDmidecode} \ ${if udev != null then "--replace /sbin/udevadm ${udev}/sbin/udevadm" else ""} \ --replace /bin/mount ${utillinuxng}/bin/mount \ --replace /bin/umount ${utillinuxng}/bin/umount \