about summary refs log tree commit diff
path: root/pkgs/os-specific/linux/udev
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2008-08-11 09:38:22 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2008-08-11 09:38:22 +0000
commit1fcc348a012b565b6a8fcc70349430307337d886 (patch)
tree17d17d74b7be7a2ef26c42670d38f0ce540ac5ae /pkgs/os-specific/linux/udev
parentac3582350ea942e794e95251630e86a2ee32b622 (diff)
downloadnixlib-1fcc348a012b565b6a8fcc70349430307337d886.tar
nixlib-1fcc348a012b565b6a8fcc70349430307337d886.tar.gz
nixlib-1fcc348a012b565b6a8fcc70349430307337d886.tar.bz2
nixlib-1fcc348a012b565b6a8fcc70349430307337d886.tar.lz
nixlib-1fcc348a012b565b6a8fcc70349430307337d886.tar.xz
nixlib-1fcc348a012b565b6a8fcc70349430307337d886.tar.zst
nixlib-1fcc348a012b565b6a8fcc70349430307337d886.zip
* Disable scsi_id on udev/klibc for now, as it doesn't compile on
  Linux 2.6.26.

svn path=/nixpkgs/trunk/; revision=12578
Diffstat (limited to 'pkgs/os-specific/linux/udev')
-rw-r--r--pkgs/os-specific/linux/udev/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/udev/default.nix b/pkgs/os-specific/linux/udev/default.nix
index a36883cc36c5..9e349391316f 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 ""})