public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linuxPackages.spl: remove unnecessary substituteInPlace

Browse Source 
`substituteInPlace` was operating on a non-existant file.
Updated to use `autoreconfHook`.
This commit is contained in:
Robin Gloster 2016-08-01 12:03:08 +00:00
parent 792ba4a466
commit a37d695c95
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/os-specific/linux/spl/default.nix
View File

@ -1,4 +1,4 @@
{ fetchFromGitHub, stdenv, autoconf, automake, libtool, coreutils, gawk { fetchFromGitHub, stdenv, autoreconfHook, coreutils, gawk
, configFile ? "all" , configFile ? "all"
# Kernel dependencies # Kernel dependencies
@ -28,14 +28,10 @@ stdenv.mkDerivation rec {
patches = [ ./const.patch ./install_prefix.patch ]; patches = [ ./const.patch ./install_prefix.patch ];
buildInputs = [ autoconf automake libtool ]; nativeBuildInputs = [ autoreconfHook ];
preConfigure = '' preConfigure = ''
./autogen.sh
substituteInPlace ./module/spl/spl-generic.c --replace /usr/bin/hostid hostid 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/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-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" substituteInPlace ./module/splat/splat-linux.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin"