diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2018-12-22 12:49:41 +0100 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2018-12-22 12:55:05 +0100 |
| commit | 1b146a8c6f55b23981c3817d8346f95bb3a799fe (patch) | |
| tree | 5db2259e12241199731aad3a890fc23717742eaf /pkgs/stdenv/generic | |
| parent | 0a2efa121d7b3a291baa04c0abcd8e7d1c7a419f (diff) | |
| download | nixpkgs-1b146a8c6f55b23981c3817d8346f95bb3a799fe.tar nixpkgs-1b146a8c6f55b23981c3817d8346f95bb3a799fe.tar.gz nixpkgs-1b146a8c6f55b23981c3817d8346f95bb3a799fe.tar.bz2 nixpkgs-1b146a8c6f55b23981c3817d8346f95bb3a799fe.tar.lz nixpkgs-1b146a8c6f55b23981c3817d8346f95bb3a799fe.tar.xz nixpkgs-1b146a8c6f55b23981c3817d8346f95bb3a799fe.tar.zst nixpkgs-1b146a8c6f55b23981c3817d8346f95bb3a799fe.zip | |
treewide: remove paxutils from stdenv
More then one year ago we removed grsecurity kernels from nixpkgs: https://github.com/NixOS/nixpkgs/pull/25277 This removes now also paxutils from stdenv.
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 be9d38f9780..f77f43aea88 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 be96d018612..03fa589138d 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 |