BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

e2fsprogs: fix on Darwin (#22973)

Browse source 
util-linux cowardly refuses to install on all platforms. Therefore we
cannot rely on it for external dependancies, in particular luuid.
e2fsprogs won't configure without the luuid dependancy being satisfied.
This commit is contained in:
Gavin Rogers 2017-02-26 04:49:56 -05:00 committed by Vladimír Čunát
parent a50222b1a3
commit 57212c947b
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/tools/filesystems/e2fsprogs/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, libuuid }:
{ stdenv, fetchurl, pkgconfig, libuuid, gettext }:
stdenv.mkDerivation rec {
name = "e2fsprogs-1.43.4";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
outputs = [ "bin" "dev" "out" "man" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libuuid ];
buildInputs = [ libuuid gettext ];
crossAttrs = {
preConfigure = ''
@ -19,11 +19,12 @@ stdenv.mkDerivation rec {
'';
};
configureFlags = [
"--enable-elf-shlibs" "--enable-symlink-install" "--enable-relative-symlinks"
configureFlags =
if stdenv.isLinux then ["--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"
];
"--disable-libuuid" "--disable-uuidd" "--disable-libblkid" "--disable-fsck"]
else ["--enable-libuuid --disable-e2initrd-helper"]
;
# hacky way to make it install *.pc
postInstall = ''