diff options
| author | Uli Baum <xeji@cat3.de> | 2018-09-13 10:08:53 +0200 |
|---|---|---|
| committer | Uli Baum <xeji@cat3.de> | 2018-09-13 10:08:53 +0200 |
| commit | 1df2560dde3df459dd0e71883c5eac014100b0b0 (patch) | |
| tree | b0151bf1948574b52b6d29fd8a656f576cfbf7f7 /pkgs/stdenv | |
| parent | 1428d00aa4a58095ba510145eb25233591ac6051 (diff) | |
| parent | 0f2b10d1ac41c2f573fddbdf110a1ae435ffdd8a (diff) | |
| download | nixlib-1df2560dde3df459dd0e71883c5eac014100b0b0.tar nixlib-1df2560dde3df459dd0e71883c5eac014100b0b0.tar.gz nixlib-1df2560dde3df459dd0e71883c5eac014100b0b0.tar.bz2 nixlib-1df2560dde3df459dd0e71883c5eac014100b0b0.tar.lz nixlib-1df2560dde3df459dd0e71883c5eac014100b0b0.tar.xz nixlib-1df2560dde3df459dd0e71883c5eac014100b0b0.tar.zst nixlib-1df2560dde3df459dd0e71883c5eac014100b0b0.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/generic/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/stdenv/linux/default.nix | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index f5da78807106..be9d38f9780a 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -123,10 +123,13 @@ let inherit (hostPlatform) isDarwin isLinux isSunOS isCygwin isFreeBSD isOpenBSD isi686 isx86_64 is64bit isAarch32 isAarch64 isMips isBigEndian; - isArm = builtins.trace + isArm = lib.warn "`stdenv.isArm` is deprecated after 18.03. Please use `stdenv.isAarch32` instead" hostPlatform.isAarch32; + # The derivation's `system` is `buildPlatform.system`. + inherit (buildPlatform) system; + # Whether we should run paxctl to pax-mark binaries. needsPax = isLinux; diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index de58178a34ba..b29a96314d2c 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -343,8 +343,8 @@ in # Mainly avoid reference to bootstrap tools allowedRequisites = with prevStage; with lib; # Simple executable tools - concatMap (p: [ (getBin p) (getLib p) ]) - [ gzip bzip2 xz bash binutils.bintools coreutils diffutils findutils + concatMap (p: [ (getBin p) (getLib p) ]) [ + gzip bzip2 xz bash binutils.bintools coreutils diffutils findutils gawk gnumake gnused gnutar gnugrep gnupatch patchelf ed paxctl ] # Library dependencies |