From 1fcc348a012b565b6a8fcc70349430307337d886 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 11 Aug 2008 09:38:22 +0000 Subject: [PATCH] * Disable scsi_id on udev/klibc for now, as it doesn't compile on Linux 2.6.26. svn path=/nixpkgs/trunk/; revision=12578 --- pkgs/os-specific/linux/udev/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/udev/default.nix b/pkgs/os-specific/linux/udev/default.nix index a36883cc36c..9e349391316 100644 --- a/pkgs/os-specific/linux/udev/default.nix +++ b/pkgs/os-specific/linux/udev/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { '' makeFlagsArray=(prefix=$out usrbindir=$out/bin usrsbindir=$out/sbin usrlibdir=$out/lib \ mandir=$out/share/man includedir=$out/include \ - EXTRAS="extras/volume_id extras/ata_id extras/edd_id extras/floppy extras/path_id extras/scsi_id extras/usb_id ${if stdenv ? isKlibc then "" else "extras/cdrom_id"}" + EXTRAS="extras/volume_id extras/ata_id extras/edd_id extras/floppy extras/path_id ${if stdenv ? isKlibc then "" else "extras/scsi_id"} extras/usb_id ${if stdenv ? isKlibc then "" else "extras/cdrom_id"}" INSTALL='install -c' DESTDIR=/ \ ${if stdenv ? isStatic then "USE_STATIC=true SHLIB= VOLUME_ID_STATIC=true" else ""})