Merge pull request #47400 from obsidiansystems/paxctl-darwin-no-mass-rebuild
paxctl: Fix darwin and cross without mass-rebuild
This commit is contained in:
commit
e59a2ef7eb
|
@ -1,4 +1,4 @@
|
||||||
{ fetchurl, stdenv }:
|
{ fetchurl, stdenv, elf-header }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "paxctl-${version}";
|
name = "paxctl-${version}";
|
||||||
|
@ -9,7 +9,17 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "0biw882fp1lmgs6kpxznp1v6758r7dg9x8iv5a06k0b82bcdsc53";
|
sha256 = "0biw882fp1lmgs6kpxznp1v6758r7dg9x8iv5a06k0b82bcdsc53";
|
||||||
};
|
};
|
||||||
|
|
||||||
preBuild = ''
|
# TODO Always do first way next mass rebuild.
|
||||||
|
buildInputs = stdenv.lib.optional
|
||||||
|
(!stdenv.hostPlatform.isLinux || !stdenv.buildPlatform.isLinux)
|
||||||
|
elf-header;
|
||||||
|
|
||||||
|
# TODO Always do first way next mass rebuild.
|
||||||
|
preBuild = if !stdenv.hostPlatform.isLinux || !stdenv.buildPlatform.isLinux then ''
|
||||||
|
sed -i Makefile \
|
||||||
|
-e 's|--owner 0 --group 0||g' \
|
||||||
|
-e '/CC:=gcc/d'
|
||||||
|
'' else ''
|
||||||
sed "s|--owner 0 --group 0||g" -i Makefile
|
sed "s|--owner 0 --group 0||g" -i Makefile
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
@ -24,7 +34,7 @@ stdenv.mkDerivation rec {
|
||||||
description = "A tool for controlling PaX flags on a per binary basis";
|
description = "A tool for controlling PaX flags on a per binary basis";
|
||||||
homepage = "https://pax.grsecurity.net";
|
homepage = "https://pax.grsecurity.net";
|
||||||
license = licenses.gpl2;
|
license = licenses.gpl2;
|
||||||
platforms = platforms.linux;
|
platforms = platforms.all;
|
||||||
maintainers = with maintainers; [ thoughtpolice ];
|
maintainers = with maintainers; [ thoughtpolice ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -53,6 +53,9 @@ in lib.init bootStages ++ [
|
||||||
else buildPackages.gcc;
|
else buildPackages.gcc;
|
||||||
|
|
||||||
extraNativeBuildInputs = old.extraNativeBuildInputs
|
extraNativeBuildInputs = old.extraNativeBuildInputs
|
||||||
|
++ lib.optionals
|
||||||
|
(hostPlatform.isLinux && !buildPlatform.isLinux)
|
||||||
|
[ buildPackages.patchelf buildPackages.paxctl ]
|
||||||
++ lib.optional
|
++ lib.optional
|
||||||
(let f = p: !p.isx86 || p.libc == "musl"; in f hostPlatform && !(f buildPlatform))
|
(let f = p: !p.isx86 || p.libc == "musl"; in f hostPlatform && !(f buildPlatform))
|
||||||
buildPackages.updateAutotoolsGnuConfigScriptsHook
|
buildPackages.updateAutotoolsGnuConfigScriptsHook
|
||||||
|
|
Loading…
Reference in a new issue