summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2008-06-30 14:31:29 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2008-06-30 14:31:29 +0000
commit5df5717181b932b288aa1b0dc471a4527b1430c6 (patch)
treed0cd1197ba77f14471317080abd8f0da458b88bf /pkgs
parentc11fe609373f55406902730a9a691a912c16746e (diff)
downloadnixpkgs-5df5717181b932b288aa1b0dc471a4527b1430c6.tar
nixpkgs-5df5717181b932b288aa1b0dc471a4527b1430c6.tar.gz
nixpkgs-5df5717181b932b288aa1b0dc471a4527b1430c6.tar.bz2
nixpkgs-5df5717181b932b288aa1b0dc471a4527b1430c6.tar.lz
nixpkgs-5df5717181b932b288aa1b0dc471a4527b1430c6.tar.xz
nixpkgs-5df5717181b932b288aa1b0dc471a4527b1430c6.tar.zst
nixpkgs-5df5717181b932b288aa1b0dc471a4527b1430c6.zip
* Build most of the helper programs in extras (ata_id, volume_id, etc.).
svn path=/nixpkgs/trunk/; revision=12220
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/os-specific/linux/udev/default.nix5
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/udev/default.nix b/pkgs/os-specific/linux/udev/default.nix
index 3cf58764644..2d7cb0e3038 100644
--- a/pkgs/os-specific/linux/udev/default.nix
+++ b/pkgs/os-specific/linux/udev/default.nix
@@ -11,7 +11,10 @@ stdenv.mkDerivation {
   # "DESTDIR=/" is a hack to prevent "make install" from trying to
   # mess with /dev.
   preBuild = ''
-    makeFlagsArray=(etcdir=$out/etc sbindir=$out/sbin usrbindir=$out/bin usrsbindir=$out/sbin mandir=$out/share/man INSTALL='install -c' DESTDIR=/)
+    makeFlagsArray=(prefix=$out usrbindir=$out/bin usrsbindir=$out/sbin usrlibdir=$out/lib \
+      mandir=$out/share/man includedir=$out/include \
+      EXTRAS="extras/ata_id extras/cdrom_id extras/edd_id extras/floppy extras/path_id extras/scsi_id extras/usb_id extras/volume_id"
+      INSTALL='install -c' DESTDIR=/)
   '';
 
   preInstall = ''