* Disable scsi_id on udev/klibc for now, as it doesn't compile on
Linux 2.6.26. svn path=/nixpkgs/trunk/; revision=12578
This commit is contained in:
parent
ac3582350e
commit
1fcc348a01
@ -14,7 +14,7 @@ stdenv.mkDerivation {
|
|||||||
''
|
''
|
||||||
makeFlagsArray=(prefix=$out usrbindir=$out/bin usrsbindir=$out/sbin usrlibdir=$out/lib \
|
makeFlagsArray=(prefix=$out usrbindir=$out/bin usrsbindir=$out/sbin usrlibdir=$out/lib \
|
||||||
mandir=$out/share/man includedir=$out/include \
|
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=/ \
|
INSTALL='install -c' DESTDIR=/ \
|
||||||
${if stdenv ? isStatic then "USE_STATIC=true SHLIB= VOLUME_ID_STATIC=true" else ""})
|
${if stdenv ? isStatic then "USE_STATIC=true SHLIB= VOLUME_ID_STATIC=true" else ""})
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user