diff options
| author | Vladimír Čunát <v@cunat.cz> | 2023-07-31 11:20:15 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-07-31 11:20:15 +0200 |
| commit | 2141d9879ad46ff7cb518e9bfd9b3a4312e8591a (patch) | |
| tree | 7baa77e067c0d96a5a4d051f3e4eecf840b3ddb0 /pkgs/stdenv/generic/default.nix | |
| parent | a3d2e71a6c6fbf389c19940899440228591b7b92 (diff) | |
| download | nixpkgs-2141d9879ad46ff7cb518e9bfd9b3a4312e8591a.tar nixpkgs-2141d9879ad46ff7cb518e9bfd9b3a4312e8591a.tar.gz nixpkgs-2141d9879ad46ff7cb518e9bfd9b3a4312e8591a.tar.bz2 nixpkgs-2141d9879ad46ff7cb518e9bfd9b3a4312e8591a.tar.lz nixpkgs-2141d9879ad46ff7cb518e9bfd9b3a4312e8591a.tar.xz nixpkgs-2141d9879ad46ff7cb518e9bfd9b3a4312e8591a.tar.zst nixpkgs-2141d9879ad46ff7cb518e9bfd9b3a4312e8591a.zip | |
Revert "stdenv: use improved strip.sh for aarch64-linux"
This reverts commit 39919b8f215110c1516f5c6b300f5ee69df23fd4. The parent merge resolved this more properly.
Diffstat (limited to 'pkgs/stdenv/generic/default.nix')
| -rw-r--r-- | pkgs/stdenv/generic/default.nix | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 0d9ae8d3c4f..cf194be92bd 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -70,10 +70,7 @@ let ../../build-support/setup-hooks/prune-libtool-files.sh ../../build-support/setup-hooks/reproducible-builds.sh ../../build-support/setup-hooks/set-source-date-epoch-to-latest.sh - (with buildPlatform; if isAarch64 && isLinux - then ../../build-support/setup-hooks/strip-tmp-aarch64.sh - else ../../build-support/setup-hooks/strip.sh - ) + ../../build-support/setup-hooks/strip.sh ] ++ lib.optionals hasCC [ cc ]; defaultBuildInputs = extraBuildInputs; |