From 537fa9185ab15382e4929724286c32a4b65950d3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 8 Aug 2008 19:54:48 +0000 Subject: [PATCH] * Some awful hackery to get volume_id to build with klibc. We'll need it for mounting by label in the initrd. svn path=/nixpkgs/trunk/; revision=12558 --- pkgs/os-specific/linux/udev/default.nix | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/udev/default.nix b/pkgs/os-specific/linux/udev/default.nix index ccdb60f6c55..a36883cc36c 100644 --- a/pkgs/os-specific/linux/udev/default.nix +++ b/pkgs/os-specific/linux/udev/default.nix @@ -10,14 +10,22 @@ stdenv.mkDerivation { # "DESTDIR=/" is a hack to prevent "make install" from trying to # mess with /dev. - preBuild = '' - makeFlagsArray=(prefix=$out usrbindir=$out/bin usrsbindir=$out/sbin usrlibdir=$out/lib \ - mandir=$out/share/man includedir=$out/include \ - EXTRAS="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/volume_id"}" - INSTALL='install -c' DESTDIR=/) + preBuild = + '' + 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"}" + INSTALL='install -c' DESTDIR=/ \ + ${if stdenv ? isStatic then "USE_STATIC=true SHLIB= VOLUME_ID_STATIC=true" else ""}) - substituteInPlace udev_rules.c --replace /lib/udev $out/lib/udev - ''; + substituteInPlace udev_rules.c --replace /lib/udev $out/lib/udev + '' + + + (if stdenv ? isStatic then + '' + # `make install' would cause the shared library to be installed, which we don't build. + substituteInPlace extras/volume_id/lib/Makefile --replace 'install:' 'disabled:' + '' else ""); preInstall = '' installFlagsArray=(udevdir=$TMPDIR/dummy)