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

Merge remote-tracking branch 'upstream/master' into hardened-stdenv

Browse Source
This commit is contained in:
Robin Gloster
2016-08-16 07:54:01 +00:00
parent 1747d28e5a 888efed972
commit 33e1c78ae3
139 changed files with 1301 additions and 1116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/spl/default.nix
+2 -6
View File
@@ -1,4 +1,4 @@
{ fetchFromGitHub, stdenv, autoconf, automake, libtool, coreutils, gawk
{ fetchFromGitHub, stdenv, autoreconfHook, coreutils, gawk
, configFile ? "all"
# Kernel dependencies
@@ -28,16 +28,12 @@ stdenv.mkDerivation rec {
patches = [ ./const.patch ./install_prefix.patch ];
buildInputs = [ autoconf automake libtool ];
nativeBuildInputs = [ autoreconfHook ];
hardeningDisable = [ "pic" ];
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"