diff --git a/pkgs/by-name/gc/gcc-arm-embedded-10/package.nix b/pkgs/by-name/gc/gcc-arm-embedded-10/package.nix index 7c7ff8a24b47..119c137ffd64 100644 --- a/pkgs/by-name/gc/gcc-arm-embedded-10/package.nix +++ b/pkgs/by-name/gc/gcc-arm-embedded-10/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man ''; - preFixup = '' + preFixup = lib.optionalString stdenv.isLinux '' 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 diff --git a/pkgs/by-name/gc/gcc-arm-embedded-11/package.nix b/pkgs/by-name/gc/gcc-arm-embedded-11/package.nix index 8cbc326a3f48..bd2525f3d6c6 100644 --- a/pkgs/by-name/gc/gcc-arm-embedded-11/package.nix +++ b/pkgs/by-name/gc/gcc-arm-embedded-11/package.nix @@ -3,9 +3,7 @@ stdenv, fetchurl, ncurses5, - python39, libxcrypt-legacy, - runtimeShell, }: stdenv.mkDerivation rec { @@ -39,9 +37,11 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out cp -r * $out + # these binaries require ancient Python 3.8 not available in Nixpkgs + rm $out/bin/{arm-none-eabi-gdb-py,arm-none-eabi-gdb-add-index-py} || : ''; - preFixup = '' + preFixup = lib.optionalString stdenv.isLinux '' 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 @@ -50,24 +50,12 @@ stdenv.mkDerivation rec { "$out" stdenv.cc.cc ncurses5 - python39 libxcrypt-legacy ] } "$f" || true done ''; - postFixup = '' - mv $out/bin/arm-none-eabi-gdb $out/bin/arm-none-eabi-gdb-unwrapped - cat < $out/bin/arm-none-eabi-gdb - #!${runtimeShell} - export PYTHONPATH=${python39}/lib/python3.9 - export PYTHONHOME=${python39.interpreter} - exec $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"; @@ -79,7 +67,10 @@ stdenv.mkDerivation rec { lgpl3 mit ]; - maintainers = with maintainers; [ prusnak ]; + maintainers = with maintainers; [ + prusnak + prtzl + ]; platforms = [ "x86_64-linux" "aarch64-linux" diff --git a/pkgs/by-name/gc/gcc-arm-embedded-12/package.nix b/pkgs/by-name/gc/gcc-arm-embedded-12/package.nix index 97a122f3034e..73eb2ceff0b2 100644 --- a/pkgs/by-name/gc/gcc-arm-embedded-12/package.nix +++ b/pkgs/by-name/gc/gcc-arm-embedded-12/package.nix @@ -3,9 +3,7 @@ stdenv, fetchurl, ncurses5, - python39, libxcrypt-legacy, - runtimeShell, }: stdenv.mkDerivation rec { @@ -41,9 +39,11 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out cp -r * $out + # these binaries require ancient Python 3.8 not available in Nixpkgs + rm $out/bin/{arm-none-eabi-gdb-py,arm-none-eabi-gdb-add-index-py} || : ''; - preFixup = '' + preFixup = lib.optionalString stdenv.isLinux '' 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 @@ -52,24 +52,12 @@ stdenv.mkDerivation rec { "$out" stdenv.cc.cc ncurses5 - python39 libxcrypt-legacy ] } "$f" || true done ''; - postFixup = '' - mv $out/bin/arm-none-eabi-gdb $out/bin/arm-none-eabi-gdb-unwrapped - cat < $out/bin/arm-none-eabi-gdb - #!${runtimeShell} - export PYTHONPATH=${python39}/lib/python3.9 - export PYTHONHOME=${python39.interpreter} - exec $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"; diff --git a/pkgs/by-name/gc/gcc-arm-embedded-13/package.nix b/pkgs/by-name/gc/gcc-arm-embedded-13/package.nix index 6eac3bc060ca..2fc5c091f53d 100644 --- a/pkgs/by-name/gc/gcc-arm-embedded-13/package.nix +++ b/pkgs/by-name/gc/gcc-arm-embedded-13/package.nix @@ -3,9 +3,7 @@ stdenv, fetchurl, ncurses5, - python39, libxcrypt-legacy, - runtimeShell, }: stdenv.mkDerivation rec { @@ -42,9 +40,11 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out cp -r * $out + # these binaries require ancient Python 3.8 not available in Nixpkgs + rm $out/bin/{arm-none-eabi-gdb-py,arm-none-eabi-gdb-add-index-py} || : ''; - preFixup = '' + preFixup = lib.optionalString stdenv.isLinux '' 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 @@ -53,24 +53,12 @@ stdenv.mkDerivation rec { "$out" stdenv.cc.cc ncurses5 - python39 libxcrypt-legacy ] } "$f" || true done ''; - postFixup = '' - mv $out/bin/arm-none-eabi-gdb $out/bin/arm-none-eabi-gdb-unwrapped - cat < $out/bin/arm-none-eabi-gdb - #!${runtimeShell} - export PYTHONPATH=${python39}/lib/python3.9 - export PYTHONHOME=${python39.interpreter} - exec $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"; diff --git a/pkgs/by-name/gc/gcc-arm-embedded-14/package.nix b/pkgs/by-name/gc/gcc-arm-embedded-14/package.nix index ea39b21d97e7..b18edddb55d4 100644 --- a/pkgs/by-name/gc/gcc-arm-embedded-14/package.nix +++ b/pkgs/by-name/gc/gcc-arm-embedded-14/package.nix @@ -4,9 +4,8 @@ fetchurl, ncurses6, libxcrypt-legacy, - runtimeShell, - zstd, xz, + zstd, }: stdenv.mkDerivation rec { @@ -57,8 +56,8 @@ stdenv.mkDerivation rec { stdenv.cc.cc ncurses6 libxcrypt-legacy - zstd xz + zstd ] } "$f" || true done diff --git a/pkgs/by-name/gc/gcc-arm-embedded-6/package.nix b/pkgs/by-name/gc/gcc-arm-embedded-6/package.nix index 70e1481e2dd4..5d6d75f5e461 100644 --- a/pkgs/by-name/gc/gcc-arm-embedded-6/package.nix +++ b/pkgs/by-name/gc/gcc-arm-embedded-6/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man ''; - preFixup = '' + preFixup = lib.optionalString stdenv.isLinux '' 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 diff --git a/pkgs/by-name/gc/gcc-arm-embedded-7/package.nix b/pkgs/by-name/gc/gcc-arm-embedded-7/package.nix index 10fdd294649c..1d594b3a320b 100644 --- a/pkgs/by-name/gc/gcc-arm-embedded-7/package.nix +++ b/pkgs/by-name/gc/gcc-arm-embedded-7/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man ''; - preFixup = '' + preFixup = lib.optionalString stdenv.isLinux '' 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 diff --git a/pkgs/by-name/gc/gcc-arm-embedded-8/package.nix b/pkgs/by-name/gc/gcc-arm-embedded-8/package.nix index ff63cb58bd99..57960b832b62 100644 --- a/pkgs/by-name/gc/gcc-arm-embedded-8/package.nix +++ b/pkgs/by-name/gc/gcc-arm-embedded-8/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man ''; - preFixup = '' + preFixup = lib.optionalString stdenv.isLinux '' 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 diff --git a/pkgs/by-name/gc/gcc-arm-embedded-9/package.nix b/pkgs/by-name/gc/gcc-arm-embedded-9/package.nix index 3dda27e3b853..04db68661c77 100644 --- a/pkgs/by-name/gc/gcc-arm-embedded-9/package.nix +++ b/pkgs/by-name/gc/gcc-arm-embedded-9/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man ''; - preFixup = '' + preFixup = lib.optionalString stdenv.isLinux '' 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