From a37d695c95a42cbe4df4e0ba06f330ceae9db2c0 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 1 Aug 2016 12:03:08 +0000 Subject: linuxPackages.spl: remove unnecessary substituteInPlace `substituteInPlace` was operating on a non-existant file. Updated to use `autoreconfHook`. --- pkgs/os-specific/linux/spl/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'pkgs/os-specific/linux/spl') diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 91fce8f2aa2c..45926228b6c8 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, autoconf, automake, libtool, coreutils, gawk +{ fetchFromGitHub, stdenv, autoreconfHook, coreutils, gawk , configFile ? "all" # Kernel dependencies @@ -28,14 +28,10 @@ stdenv.mkDerivation rec { patches = [ ./const.patch ./install_prefix.patch ]; - buildInputs = [ autoconf automake libtool ]; + nativeBuildInputs = [ autoreconfHook ]; preConfigure = '' - ./autogen.sh - substituteInPlace ./module/spl/spl-generic.c --replace /usr/bin/hostid hostid - substituteInPlace ./module/spl/spl-module.c --replace /bin/mknod mknod - substituteInPlace ./module/spl/spl-generic.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:${gawk}:/bin" substituteInPlace ./module/splat/splat-vnode.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin" substituteInPlace ./module/splat/splat-linux.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin" -- cgit 1.4.1