gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #224815 from prtzl/gcc-arm-embedded

Browse Source 
gcc-arm-embedded: fix arm-none-eabi-gdb missing lib and python path
This commit is contained in:
Pavol Rusnak
2023-04-05 18:02:38 +02:00
committed by GitHub
parent 27e517373d d7eabb3781
commit ccef8c0231
3 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/gcc-arm-embedded/10/default.nix
+1 -1
View File
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors";
homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm";
license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ];
maintainers = with maintainers; [ prusnak ];
maintainers = with maintainers; [ prusnak prtzl ];
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
};
pkgs/development/compilers/gcc-arm-embedded/11/default.nix
+14 -1
View File
@@ -3,6 +3,8 @@
, fetchurl
, ncurses5
, python38
, libxcrypt-legacy
, runtimeShell
}:
stdenv.mkDerivation rec {
@@ -38,10 +40,21 @@ stdenv.mkDerivation rec {
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 ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python38 ]} "$f" || true
patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python38 libxcrypt-legacy ]} "$f" || true
done
'';
postFixup = ''
mv $out/bin/arm-none-eabi-gdb $out/bin/arm-none-eabi-gdb-unwrapped
cat <<EOF > $out/bin/arm-none-eabi-gdb
#!${runtimeShell}
export PYTHONPATH=${python38}/lib/python3.8
export PYTHONHOME=${python38}/bin/python3.8
$out/bin/arm-none-eabi-gdb-unwrapped
EOF
chmod +x $out/bin/arm-none-eabi-gdb
'';
meta = with lib; {
description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors";
homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm";
pkgs/development/compilers/gcc-arm-embedded/12/default.nix
+15 -2
View File
@@ -3,6 +3,8 @@
, fetchurl
, ncurses5
, python38
, libxcrypt-legacy
, runtimeShell
}:
stdenv.mkDerivation rec {
@@ -40,15 +42,26 @@ stdenv.mkDerivation rec {
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 ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python38 ]} "$f" || true
patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python38 libxcrypt-legacy ]} "$f" || true
done
'';
postFixup = ''
mv $out/bin/arm-none-eabi-gdb $out/bin/arm-none-eabi-gdb-unwrapped
cat <<EOF > $out/bin/arm-none-eabi-gdb
#!${runtimeShell}
export PYTHONPATH=${python38}/lib/python3.8
export PYTHONHOME=${python38}/bin/python3.8
$out/bin/arm-none-eabi-gdb-unwrapped
EOF
chmod +x $out/bin/arm-none-eabi-gdb
'';
meta = with lib; {
description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors";
homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm";
license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ];
maintainers = with maintainers; [ prusnak ];
maintainers = with maintainers; [ prusnak prtzl ];
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
};