Skip to content

Commit 44986fd

Browse files
prusnakprusnak
committed
gcc-arm-embedded: remove dependency on ancient Python
1 parent b7e0944 commit 44986fd

File tree

9 files changed

+20
-54
lines changed

9 files changed

+20
-54
lines changed

‎pkgs/by-name/gc/gcc-arm-embedded-10/package.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
4040
ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man
4141
'';
4242

43-
preFixup = ''
43+
preFixup = lib.optionalString stdenv.isLinux ''
4444
find $out -type f | while read f; do
4545
patchelf "$f" > /dev/null 2>&1 || continue
4646
patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true

‎pkgs/by-name/gc/gcc-arm-embedded-11/package.nix‎

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
stdenv,
44
fetchurl,
55
ncurses5,
6-
python39,
76
libxcrypt-legacy,
8-
runtimeShell,
97
}:
108

119
stdenv.mkDerivation rec {
@@ -39,9 +37,11 @@ stdenv.mkDerivation rec {
3937
installPhase = ''
4038
mkdir -p $out
4139
cp -r * $out
40+
# these binaries require ancient Python 3.8 not available in Nixpkgs
41+
rm $out/bin/{arm-none-eabi-gdb-py,arm-none-eabi-gdb-add-index-py} || :
4242
'';
4343

44-
preFixup = ''
44+
preFixup = lib.optionalString stdenv.isLinux ''
4545
find $out -type f | while read f; do
4646
patchelf "$f" > /dev/null 2>&1 || continue
4747
patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true
@@ -50,24 +50,12 @@ stdenv.mkDerivation rec {
5050
"$out"
5151
stdenv.cc.cc
5252
ncurses5
53-
python39
5453
libxcrypt-legacy
5554
]
5655
} "$f" || true
5756
done
5857
'';
5958

60-
postFixup = ''
61-
mv $out/bin/arm-none-eabi-gdb $out/bin/arm-none-eabi-gdb-unwrapped
62-
cat <<EOF > $out/bin/arm-none-eabi-gdb
63-
#!${runtimeShell}
64-
export PYTHONPATH=${python39}/lib/python3.9
65-
export PYTHONHOME=${python39.interpreter}
66-
exec $out/bin/arm-none-eabi-gdb-unwrapped "\$@"
67-
EOF
68-
chmod +x $out/bin/arm-none-eabi-gdb
69-
'';
70-
7159
meta = with lib; {
7260
description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors";
7361
homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm";
@@ -79,7 +67,10 @@ stdenv.mkDerivation rec {
7967
lgpl3
8068
mit
8169
];
82-
maintainers = with maintainers; [ prusnak ];
70+
maintainers = with maintainers; [
71+
prusnak
72+
prtzl
73+
];
8374
platforms = [
8475
"x86_64-linux"
8576
"aarch64-linux"

‎pkgs/by-name/gc/gcc-arm-embedded-12/package.nix‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
stdenv,
44
fetchurl,
55
ncurses5,
6-
python39,
76
libxcrypt-legacy,
8-
runtimeShell,
97
}:
108

119
stdenv.mkDerivation rec {
@@ -41,9 +39,11 @@ stdenv.mkDerivation rec {
4139
installPhase = ''
4240
mkdir -p $out
4341
cp -r * $out
42+
# these binaries require ancient Python 3.8 not available in Nixpkgs
43+
rm $out/bin/{arm-none-eabi-gdb-py,arm-none-eabi-gdb-add-index-py} || :
4444
'';
4545

46-
preFixup = ''
46+
preFixup = lib.optionalString stdenv.isLinux ''
4747
find $out -type f | while read f; do
4848
patchelf "$f" > /dev/null 2>&1 || continue
4949
patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true
@@ -52,24 +52,12 @@ stdenv.mkDerivation rec {
5252
"$out"
5353
stdenv.cc.cc
5454
ncurses5
55-
python39
5655
libxcrypt-legacy
5756
]
5857
} "$f" || true
5958
done
6059
'';
6160

62-
postFixup = ''
63-
mv $out/bin/arm-none-eabi-gdb $out/bin/arm-none-eabi-gdb-unwrapped
64-
cat <<EOF > $out/bin/arm-none-eabi-gdb
65-
#!${runtimeShell}
66-
export PYTHONPATH=${python39}/lib/python3.9
67-
export PYTHONHOME=${python39.interpreter}
68-
exec $out/bin/arm-none-eabi-gdb-unwrapped "\$@"
69-
EOF
70-
chmod +x $out/bin/arm-none-eabi-gdb
71-
'';
72-
7361
meta = with lib; {
7462
description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors";
7563
homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm";

‎pkgs/by-name/gc/gcc-arm-embedded-13/package.nix‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
stdenv,
44
fetchurl,
55
ncurses5,
6-
python39,
76
libxcrypt-legacy,
8-
runtimeShell,
97
}:
108

119
stdenv.mkDerivation rec {
@@ -42,9 +40,11 @@ stdenv.mkDerivation rec {
4240
installPhase = ''
4341
mkdir -p $out
4442
cp -r * $out
43+
# these binaries require ancient Python 3.8 not available in Nixpkgs
44+
rm $out/bin/{arm-none-eabi-gdb-py,arm-none-eabi-gdb-add-index-py} || :
4545
'';
4646

47-
preFixup = ''
47+
preFixup = lib.optionalString stdenv.isLinux ''
4848
find $out -type f | while read f; do
4949
patchelf "$f" > /dev/null 2>&1 || continue
5050
patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true
@@ -53,24 +53,12 @@ stdenv.mkDerivation rec {
5353
"$out"
5454
stdenv.cc.cc
5555
ncurses5
56-
python39
5756
libxcrypt-legacy
5857
]
5958
} "$f" || true
6059
done
6160
'';
6261

63-
postFixup = ''
64-
mv $out/bin/arm-none-eabi-gdb $out/bin/arm-none-eabi-gdb-unwrapped
65-
cat <<EOF > $out/bin/arm-none-eabi-gdb
66-
#!${runtimeShell}
67-
export PYTHONPATH=${python39}/lib/python3.9
68-
export PYTHONHOME=${python39.interpreter}
69-
exec $out/bin/arm-none-eabi-gdb-unwrapped "\$@"
70-
EOF
71-
chmod +x $out/bin/arm-none-eabi-gdb
72-
'';
73-
7462
meta = with lib; {
7563
description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors";
7664
homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm";

‎pkgs/by-name/gc/gcc-arm-embedded-14/package.nix‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@
44
fetchurl,
55
ncurses6,
66
libxcrypt-legacy,
7-
runtimeShell,
8-
zstd,
97
xz,
8+
zstd,
109
}:
1110

1211
stdenv.mkDerivation rec {
@@ -57,8 +56,8 @@ stdenv.mkDerivation rec {
5756
stdenv.cc.cc
5857
ncurses6
5958
libxcrypt-legacy
60-
zstd
6159
xz
60+
zstd
6261
]
6362
} "$f" || true
6463
done

‎pkgs/by-name/gc/gcc-arm-embedded-6/package.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
3939
ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man
4040
'';
4141

42-
preFixup = ''
42+
preFixup = lib.optionalString stdenv.isLinux ''
4343
find $out -type f | while read f; do
4444
patchelf "$f" > /dev/null 2>&1 || continue
4545
patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true

‎pkgs/by-name/gc/gcc-arm-embedded-7/package.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
3939
ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man
4040
'';
4141

42-
preFixup = ''
42+
preFixup = lib.optionalString stdenv.isLinux ''
4343
find $out -type f | while read f; do
4444
patchelf "$f" > /dev/null 2>&1 || continue
4545
patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true

‎pkgs/by-name/gc/gcc-arm-embedded-8/package.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
3939
ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man
4040
'';
4141

42-
preFixup = ''
42+
preFixup = lib.optionalString stdenv.isLinux ''
4343
find $out -type f | while read f; do
4444
patchelf "$f" > /dev/null 2>&1 || continue
4545
patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true

‎pkgs/by-name/gc/gcc-arm-embedded-9/package.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
4141
ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man
4242
'';
4343

44-
preFixup = ''
44+
preFixup = lib.optionalString stdenv.isLinux ''
4545
find $out -type f | while read f; do
4646
patchelf "$f" > /dev/null 2>&1 || continue
4747
patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true

0 commit comments

Comments
 (0)