Commit c6e871f6 authored by Artturin's avatar Artturin
Browse files

newlib: improve the nano version 

apply patch from gentoo because there's no libstdc++.a libsupc++.a or
their nano versions

this matches upstream arm more
https://developer.arm.com/downloads/-/arm-gnu-toolchain-downloads

-lc_nano is used in nano.specs but 'libc_nano.a' is not installed without these changes
parent 9b0777ff

pkgs/development/misc/newlib/default.nix

+27 −4
Original line number Diff line number Diff line 
{ stdenv, fetchurl, buildPackages

{ stdenv, fetchurl, buildPackages, lib, fetchpatch

, # "newlib-nano" is what the official ARM embedded toolchain calls this build

  # configuration that prioritizes low space usage. We include it as a preset

  # for embedded projects striving for a similar configuration.

  nanoizeNewlib ? false

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "newlib";

  version = "4.1.0";



  src = fetchurl {

    url = "ftp://sourceware.org/pub/newlib/newlib-${version}.tar.gz";

    url = "ftp://sourceware.org/pub/newlib/newlib-${finalAttrs.version}.tar.gz";

    sha256 = "0m01sjjyj0ib7bwlcrvmk1qkkgd66zf1dhbw716j490kymrf75pj";

  };



  patches = lib.optionals nanoizeNewlib [

    # https://bugs.gentoo.org/723756

    (fetchpatch {

      name = "newlib-3.3.0-no-nano-cxx.patch";

      url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-libs/newlib/files/newlib-3.3.0-no-nano-cxx.patch?id=9ee5a1cd6f8da6d084b93b3dbd2e8022a147cfbf";

      sha256 = "sha256-S3mf7vwrzSMWZIGE+d61UDH+/SK/ao1hTPee1sElgco=";

    })

  ];



  depsBuildBuild = [ buildPackages.stdenv.cc ];



  # newlib expects CC to build for build platform, not host platform
@@ -45,8 +54,22 @@ stdenv.mkDerivation rec { 


  dontDisableStatic = true;



  # apply necessary nano changes from https://developer.arm.com/-/media/Files/downloads/gnu/12.2.rel1/manifest/copy_nano_libraries.sh?rev=4c50be6ccb9c4205a5262a3925317073&hash=1375A7B0A1CD0DB9B9EB0D2B574ADF66

  postInstall = lib.optionalString nanoizeNewlib ''

    mkdir -p $out${finalAttrs.passthru.incdir}/newlib-nano

    cp $out${finalAttrs.passthru.incdir}/newlib.h $out${finalAttrs.passthru.incdir}/newlib-nano/



    (

      cd $out${finalAttrs.passthru.libdir}



      for f in librdimon.a libc.a libg.a; do

        cp "$f" "''${f%%\.a}_nano.a"

      done

    )

  '';



  passthru = {

    incdir = "/${stdenv.targetPlatform.config}/include";

    libdir = "/${stdenv.targetPlatform.config}/lib";

  };

}
 
})