diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-23 12:40:13 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-23 12:40:13 +0000 |
| commit | 58752914f4b22a570ff7cba694df86aef20e255a (patch) | |
| tree | 13ed5492ea1c875253d18c4bcb981f9effe11ee2 /pkgs/development/compilers/gcc-arm-embedded/7/default.nix | |
| parent | f6c56619d7aa645772bf160c048b36d2269508c6 (diff) | |
| parent | 10a27d6d5296619de1a05538cd1d5b81b612b225 (diff) | |
| download | nixpkgs-58752914f4b22a570ff7cba694df86aef20e255a.tar nixpkgs-58752914f4b22a570ff7cba694df86aef20e255a.tar.gz nixpkgs-58752914f4b22a570ff7cba694df86aef20e255a.tar.bz2 nixpkgs-58752914f4b22a570ff7cba694df86aef20e255a.tar.lz nixpkgs-58752914f4b22a570ff7cba694df86aef20e255a.tar.xz nixpkgs-58752914f4b22a570ff7cba694df86aef20e255a.tar.zst nixpkgs-58752914f4b22a570ff7cba694df86aef20e255a.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/compilers/gcc-arm-embedded/7/default.nix')
| -rw-r--r-- | pkgs/development/compilers/gcc-arm-embedded/7/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix index 633ae054d05..4f2135446f6 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , ncurses5 , python27 @@ -37,11 +37,11 @@ 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 ${stdenv.lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true + patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true done ''; - meta = with stdenv.lib; { + 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 ]; |