diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-06-19 22:47:30 +0300 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-07-04 01:53:13 +0300 |
commit | d8cd615720524bf7600ff31e4ba3779264c084e9 (patch) | |
tree | 39613cd2fdd621ceeec3d3ccef61d3f46874ba19 /pkgs | |
parent | 18572e23590f7407be60926e6d98d1a3580571c1 (diff) |
raspberrypifw: 1.20160315 -> 1.20160620
- Use fetchFromGitHub - Some files in bin/ are now shell scripts, so skip patchelf on any non-ELF files. With this U-Boot can be successfully launched on a RPi 3.
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/os-specific/linux/firmware/raspberrypi/default.nix | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index 0c61aee9713ef..4787eb57afd31 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix @@ -1,15 +1,14 @@ -{stdenv, fetchurl }: +{ stdenv, fetchFromGitHub }: -let +stdenv.mkDerivation rec { + name = "raspberrypi-firmware-${version}"; + version = "1.20160620"; - rev = "1.20160315"; - -in stdenv.mkDerivation { - name = "raspberrypi-firmware-${rev}"; - - src = fetchurl { - url = "https://github.com/raspberrypi/firmware/archive/${rev}.tar.gz"; - sha256 = "0a7ycv01s0kk84szsh51hy2mjjil1dzdk0g7k83h50d5nya090fl"; + src = fetchFromGitHub { + owner = "raspberrypi"; + repo = "firmware"; + rev = version; + sha256 = "06g691px0abndp5zvz2ba1g675rcqb64n055h5ahgnlck5cdpawg"; }; installPhase = '' @@ -19,8 +18,10 @@ in stdenv.mkDerivation { cp opt/vc/LICENCE $out/share/raspberrypi for f in $out/bin/*; do - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" - patchelf --set-rpath "$out/lib" "$f" + if isELF "$f"; then + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" + patchelf --set-rpath "$out/lib" "$f" + fi done ''; |