Unverified Commit 48a2416b authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #204012 from prusnak/gcc-arm-embedded

parents 4b092d03 f25d7194

pkgs/development/compilers/gcc-arm-embedded/10/default.nix

+1 −2
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
, stdenv

, fetchurl

, ncurses5

, python27

}:



stdenv.mkDerivation rec {
@@ -40,7 +39,7 @@ 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 python27 ]} "$f" || true

      patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 ]} "$f" || true

    done

  '';

pkgs/development/compilers/gcc-arm-embedded/6/default.nix

+1 −2
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
, stdenv

, fetchurl

, ncurses5

, python27

}:



stdenv.mkDerivation rec {
@@ -39,7 +38,7 @@ 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 python27 ]} "$f" || true

      patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 ]} "$f" || true

    done

  '';

pkgs/development/compilers/gcc-arm-embedded/7/default.nix

+1 −2
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
, stdenv

, fetchurl

, ncurses5

, python27

}:



stdenv.mkDerivation rec {
@@ -39,7 +38,7 @@ 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 python27 ]} "$f" || true

      patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 ]} "$f" || true

    done

  '';

pkgs/development/compilers/gcc-arm-embedded/8/default.nix

+1 −2
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
, stdenv

, fetchurl

, ncurses5

, python27

}:



stdenv.mkDerivation rec {
@@ -39,7 +38,7 @@ 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 python27 ]} "$f" || true

      patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 ]} "$f" || true

    done

  '';

pkgs/development/compilers/gcc-arm-embedded/9/default.nix

+1 −2
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
, stdenv

, fetchurl

, ncurses5

, python27

}:



stdenv.mkDerivation rec {
@@ -41,7 +40,7 @@ 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 python27 ]} "$f" || true

      patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 ]} "$f" || true

    done

  '';