diff options
Diffstat (limited to 'pkgs/stdenv/generic')
| -rw-r--r-- | pkgs/stdenv/generic/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/stdenv/generic/setup.sh | 4 |
2 files changed, 0 insertions, 7 deletions
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index be9d38f9780a6..f77f43aea8863 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -130,9 +130,6 @@ let # The derivation's `system` is `buildPlatform.system`. inherit (buildPlatform) system; - # Whether we should run paxctl to pax-mark binaries. - needsPax = isLinux; - inherit (import ./make-derivation.nix { inherit lib config stdenv; }) mkDerivation; diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index be96d018612cf..03fa589138d52 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -280,10 +280,6 @@ if [ -z "${SHELL:-}" ]; then echo "SHELL not set"; exit 1; fi BASH="$SHELL" export CONFIG_SHELL="$SHELL" -# Dummy implementation of the paxmark function. On Linux, this is -# overwritten by paxctl's setup hook. -paxmark() { true; } - # Execute the pre-hook. if [ -z "${shell:-}" ]; then export shell="$SHELL"; fi |