Merge pull request #47395 from obsidiansystems/paxctl-darwin

paxctl: Fix darwin and cross and use for linux cross
This commit is contained in:
John Ericson 2018-09-26 13:55:49 -04:00 committed by GitHub
commit 219a48f1ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 3 deletions

View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv }:
{ fetchurl, stdenv, elf-header }:
stdenv.mkDerivation rec {
name = "paxctl-${version}";
@ -9,8 +9,12 @@ stdenv.mkDerivation rec {
sha256 = "0biw882fp1lmgs6kpxznp1v6758r7dg9x8iv5a06k0b82bcdsc53";
};
buildInputs = [ elf-header ];
preBuild = ''
sed "s|--owner 0 --group 0||g" -i Makefile
sed -i Makefile \
-e 's|--owner 0 --group 0||g' \
-e '/CC:=gcc/d'
'';
makeFlags = [
@ -24,7 +28,7 @@ stdenv.mkDerivation rec {
description = "A tool for controlling PaX flags on a per binary basis";
homepage = "https://pax.grsecurity.net";
license = licenses.gpl2;
platforms = platforms.linux;
platforms = platforms.all;
maintainers = with maintainers; [ thoughtpolice ];
};
}

View File

@ -53,6 +53,9 @@ in lib.init bootStages ++ [
else buildPackages.gcc;
extraNativeBuildInputs = old.extraNativeBuildInputs
++ lib.optionals
(hostPlatform.isLinux && !buildPlatform.isLinux)
[ buildPackages.patchelf buildPackages.paxctl ]
++ lib.optional
(let f = p: !p.isx86 || p.libc == "musl"; in f hostPlatform && !(f buildPlatform))
buildPackages.updateAutotoolsGnuConfigScriptsHook