From e27774e9df3ae87cf1654cc1d391288032fd39dd Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 15 Dec 2020 15:51:03 +0000 Subject: [PATCH] linuxPackages.zfs: use autoconf 2.69 I bring in autoreconfHook269 instead of overriding it in all-packages.nix, so that when an unstable version of ZFS comes out that supports autoconf 2.70, it can use the latest autoconf even if stable ZFS still needs the old version. --- pkgs/os-specific/linux/zfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index a2464aeb586..8bdf9efd445 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch -, autoreconfHook, util-linux, nukeReferences, coreutils +, autoreconfHook269, util-linux, nukeReferences, coreutils , perl, buildPackages , configFile ? "all" @@ -89,7 +89,7 @@ let "PATH=${makeBinPath [ coreutils gawk gnused gnugrep systemd ]}" ''; - nativeBuildInputs = [ autoreconfHook nukeReferences ] + nativeBuildInputs = [ autoreconfHook269 nukeReferences ] ++ optionals buildKernel (kernel.moduleBuildDependencies ++ [ perl ]) ++ optional buildUser pkgconfig; buildInputs = optionals buildUser [ zlib libuuid attr libtirpc ]