diff options
| author | Fabián Heredia Montiel <fabianhjr@protonmail.com> | 2023-12-04 17:44:17 -0600 |
|---|---|---|
| committer | Fabián Heredia Montiel <fabianhjr@protonmail.com> | 2023-12-04 17:44:17 -0600 |
| commit | 5b8deaceca7538f7f33c7e72464ec2590c14dc43 (patch) | |
| tree | 5cd2f63728218d2c41f04d77c9a9c9987bc26afa /pkgs/build-support/bintools-wrapper/default.nix | |
| parent | 360a5f0549cc556bed6bcf5c5ef8d2b603765c19 (diff) | |
| parent | 00bff935cb14b56a6c268ba149ef16a9f2d8015e (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Fixed conflict in pkgs/applications/graphics/krita/ krita: 5.1.5 -> 5.2.0 7a40fdc288e69ba94947c1c4ec29c0f24e461eef , and treewide: use kde mirror everywhere, don't use pname in download urls aa15f5066d695de4c4027bd8bdcf4cedcf58d058
Diffstat (limited to 'pkgs/build-support/bintools-wrapper/default.nix')
| -rw-r--r-- | pkgs/build-support/bintools-wrapper/default.nix | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index f19605e462597..525b44fe04800 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -301,12 +301,6 @@ stdenv.mkDerivation { hardening_unsupported_flags+=" relro bindnow" '' - + optionalString (libc != null && targetPlatform.isAvr) '' - for isa in avr5 avr3 avr4 avr6 avr25 avr31 avr35 avr51 avrxmega2 avrxmega4 avrxmega5 avrxmega6 avrxmega7 tiny-stack; do - echo "-L${getLib libc}/avr/lib/$isa" >> $out/nix-support/libc-cflags - done - '' - + optionalString stdenv.targetPlatform.isDarwin '' echo "-arch ${targetPlatform.darwinArch}" >> $out/nix-support/libc-ldflags '' |