diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-12-15 15:51:03 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-12-17 12:53:48 +0000 |
commit | e27774e9df3ae87cf1654cc1d391288032fd39dd (patch) | |
tree | 1d2e540d1818bc038c1e57aa3000ea48a685ed71 /pkgs/os-specific/linux/zfs | |
parent | 3e6001f9ef134b6b8682a74bfdf51e42689a25e6 (diff) | |
download | nixpkgs-e27774e9df3ae87cf1654cc1d391288032fd39dd.tar nixpkgs-e27774e9df3ae87cf1654cc1d391288032fd39dd.tar.gz nixpkgs-e27774e9df3ae87cf1654cc1d391288032fd39dd.tar.bz2 nixpkgs-e27774e9df3ae87cf1654cc1d391288032fd39dd.tar.lz nixpkgs-e27774e9df3ae87cf1654cc1d391288032fd39dd.tar.xz nixpkgs-e27774e9df3ae87cf1654cc1d391288032fd39dd.tar.zst nixpkgs-e27774e9df3ae87cf1654cc1d391288032fd39dd.zip |
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.
Diffstat (limited to 'pkgs/os-specific/linux/zfs')
-rw-r--r-- | pkgs/os-specific/linux/zfs/default.nix | 4 |
1 files 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 ] |