util-linux, e2fsprogs: fixup multiple outputs
Also revert back to using util-linux as the default libuuid provider, and make e2fsprogs use shared libs from util-linux.
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, autoreconfHook, gettext, pkgconfig, libuuid }:
|
||||
{ stdenv, fetchurl, pkgconfig, libuuid }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "e2fsprogs-1.42.12";
|
||||
@@ -8,9 +8,11 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0v0qcfyls0dlrjy8gx9m3s2wbkp5z3lbsr5hb7x8kp8f3bclcy71";
|
||||
};
|
||||
|
||||
outputs = [ "dev" "out" "bin" "man" ];
|
||||
outputs = [ "bin" "out" "man" ];
|
||||
outputDev = "bin"; # just for *.pc
|
||||
|
||||
buildInputs = [ pkgconfig /*libuuid*/ ];
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ libuuid ];
|
||||
|
||||
crossAttrs = {
|
||||
preConfigure = ''
|
||||
@@ -18,16 +20,20 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
};
|
||||
|
||||
# libuuid, libblkid, uuidd and fsck are in util-linux-ng (the "libuuid" dependency).
|
||||
# ToDo: failed with shared uuid and blkid
|
||||
configureFlags = "--enable-elf-shlibs --disable-fsck --enable-symlink-install";
|
||||
configureFlags = [
|
||||
"--enable-elf-shlibs" "--enable-symlink-install" "--enable-relative-symlinks"
|
||||
# libuuid, libblkid, uuidd and fsck are in util-linux-ng (the "libuuid" dependency).
|
||||
"--disable-libuuid" "--disable-uuidd" "--disable-libblkid" "--disable-fsck"
|
||||
];
|
||||
|
||||
# hacky way to make it install *.pc
|
||||
postInstall = ''
|
||||
make install-libs
|
||||
rm "$out"/lib/*.a
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
preInstall = "installFlagsArray=('LN=ln -s')";
|
||||
|
||||
postInstall = "make install-libs";
|
||||
|
||||
meta = {
|
||||
homepage = http://e2fsprogs.sourceforge.net/;
|
||||
description = "Tools for creating and checking ext2/ext3/ext4 filesystems";
|
||||
|
||||
Reference in New Issue
Block a user