From 57212c947b5a289fe4ee12e58a1246b608ef3fee Mon Sep 17 00:00:00 2001 From: Gavin Rogers Date: Sun, 26 Feb 2017 04:49:56 -0500 Subject: [PATCH] e2fsprogs: fix on Darwin (#22973) 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. --- pkgs/tools/filesystems/e2fsprogs/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index c44c92efae00..739b7e7c9757 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -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 = ''