gcc-arm-embedded: 6-2017-q2-update -> 7-2018-q2-update

+ update blackmagic to latest commit which includes gcc7 fixes
This commit is contained in:
Pavol Rusnak 2018-10-01 21:12:54 +02:00
parent 5eefdebf49
commit b3531b9719
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
4 changed files with 48 additions and 3 deletions

View File

@ -3304,6 +3304,11 @@
github = "proglodyte"; github = "proglodyte";
name = "Proglodyte"; name = "Proglodyte";
}; };
prusnak = {
email = "stick@gk2.sk";
github = "prusnak";
name = "Pavol Rusnak";
};
pshendry = { pshendry = {
email = "paul@pshendry.com"; email = "paul@pshendry.com";
github = "pshendry"; github = "pshendry";

View File

@ -0,0 +1,39 @@
{ stdenv, lib, fetchurl, ncurses5, python27 }:
with lib;
stdenv.mkDerivation rec {
name = "gcc-arm-embedded-${version}";
version = "7-2018-q2-update";
subdir = "7-2018q2";
urlString = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-linux.tar.bz2";
src = fetchurl { url=urlString; sha256="0sgysp3hfpgrkcbfiwkp0a7ymqs02khfbrjabm52b5z61sgi05xv"; };
phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
installPhase = ''
mkdir -p $out
cp -r * $out
'';
dontPatchELF = true;
dontStrip = true;
preFixup = ''
find $out -type f | while read f; do
patchelf $f > /dev/null 2>&1 || continue
patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true
patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true
done
'';
meta = {
description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors (Cortex-M0/M0+/M3/M4/M7, Cortex-R4/R5/R7/R8)";
homepage = https://developer.arm.com/open-source/gnu-toolchain/gnu-rm;
license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ];
maintainers = with maintainers; [ prusnak ];
platforms = platforms.linux;
};
}

View File

@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "blacksphere"; owner = "blacksphere";
repo = "blackmagic"; repo = "blackmagic";
rev = "d3a8f27fdbf952194e8fc5ce9b2fc9bcef7c545c"; rev = "29386aee140e5e99a958727358f60980418b4c88";
sha256 = "0c3l7cfqag3g7zrfn4mmikkx7076hb1r856ybhhdh0f6zji2j6jx"; sha256 = "05x19y80mixk6blpnfpfngy5d41jpjvdqgjzkmhv1qc03bhyhc82";
fetchSubmodules = true; fetchSubmodules = true;
}; };

View File

@ -6744,7 +6744,8 @@ with pkgs;
ncurses = pkgsi686Linux.ncurses5; ncurses = pkgsi686Linux.ncurses5;
}; };
gcc-arm-embedded-6 = callPackage ../development/compilers/gcc-arm-embedded/6 {}; gcc-arm-embedded-6 = callPackage ../development/compilers/gcc-arm-embedded/6 {};
gcc-arm-embedded = gcc-arm-embedded-6; gcc-arm-embedded-7 = callPackage ../development/compilers/gcc-arm-embedded/7 {};
gcc-arm-embedded = gcc-arm-embedded-7;
gforth = callPackage ../development/compilers/gforth {}; gforth = callPackage ../development/compilers/gforth {};