diff --git a/pkgs/development/compilers/gcc-arm-embedded/10/default.nix b/pkgs/development/compilers/gcc-arm-embedded/10/default.nix index 88f8f1f2eae2..b300a190e1c8 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/10/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/10/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { preFixup = '' find $out -type f | while read f; do - patchelf $f > /dev/null 2>&1 || continue + 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 diff --git a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix index f635fce972f5..7d8a4b5b14d9 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix @@ -22,7 +22,10 @@ stdenv.mkDerivation rec { }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + dontConfigure = true; + dontBuild = true; + dontPatchELF = true; + dontStrip = true; installPhase = '' mkdir -p $out @@ -30,12 +33,9 @@ stdenv.mkDerivation rec { ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man ''; - dontPatchELF = true; - dontStrip = true; - preFixup = '' find $out -type f | while read f; do - patchelf $f > /dev/null 2>&1 || continue + 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 diff --git a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix index 4944038fde41..633ae054d050 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix @@ -22,7 +22,10 @@ stdenv.mkDerivation rec { }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + dontConfigure = true; + dontBuild = true; + dontPatchELF = true; + dontStrip = true; installPhase = '' mkdir -p $out @@ -30,12 +33,9 @@ stdenv.mkDerivation rec { ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man ''; - dontPatchELF = true; - dontStrip = true; - preFixup = '' find $out -type f | while read f; do - patchelf $f > /dev/null 2>&1 || continue + 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 diff --git a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix index 510889dad621..99ec9d1b549d 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix @@ -22,7 +22,10 @@ stdenv.mkDerivation rec { }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + dontConfigure = true; + dontBuild = true; + dontPatchELF = true; + dontStrip = true; installPhase = '' mkdir -p $out @@ -30,12 +33,9 @@ stdenv.mkDerivation rec { ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man ''; - dontPatchELF = true; - dontStrip = true; - preFixup = '' find $out -type f | while read f; do - patchelf $f > /dev/null 2>&1 || continue + 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 diff --git a/pkgs/development/compilers/gcc-arm-embedded/9/default.nix b/pkgs/development/compilers/gcc-arm-embedded/9/default.nix index 98b126e85f88..c4c1ebc1d8a6 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/9/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/9/default.nix @@ -24,7 +24,10 @@ stdenv.mkDerivation rec { }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + dontConfigure = true; + dontBuild = true; + dontPatchELF = true; + dontStrip = true; installPhase = '' mkdir -p $out @@ -32,12 +35,9 @@ stdenv.mkDerivation rec { ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man ''; - dontPatchELF = true; - dontStrip = true; - preFixup = '' find $out -type f | while read f; do - patchelf $f > /dev/null 2>&1 || continue + 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