diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-11-03 00:23:57 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-03 00:23:57 +0000 |
| commit | 90c92918f15b9feb11a2661160e28c256795844b (patch) | |
| tree | 9cb906b4af179c3a4d911cdd5a8c4aa49f9cf050 /pkgs | |
| parent | 52a67e71de2553eefc8d83a7bfbb760b63006097 (diff) | |
| parent | 454c42c8493fb4425ae98444fcb8e14db013c3d4 (diff) | |
| download | nixlib-90c92918f15b9feb11a2661160e28c256795844b.tar nixlib-90c92918f15b9feb11a2661160e28c256795844b.tar.gz nixlib-90c92918f15b9feb11a2661160e28c256795844b.tar.bz2 nixlib-90c92918f15b9feb11a2661160e28c256795844b.tar.lz nixlib-90c92918f15b9feb11a2661160e28c256795844b.tar.xz nixlib-90c92918f15b9feb11a2661160e28c256795844b.tar.zst nixlib-90c92918f15b9feb11a2661160e28c256795844b.zip | |
Merge pull request #31151 from lheckemann/vboot-update
vboot_reference: 20130507 -> 20171023
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/system/vboot_reference/default.nix | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/pkgs/tools/system/vboot_reference/default.nix b/pkgs/tools/system/vboot_reference/default.nix index 6dfc6d1349d0..0b8933bb7af3 100644 --- a/pkgs/tools/system/vboot_reference/default.nix +++ b/pkgs/tools/system/vboot_reference/default.nix @@ -1,42 +1,35 @@ -{ stdenv, fetchgit, pkgconfig, libuuid, openssl }: +{ stdenv, fetchgit, pkgconfig, libuuid, openssl, libyaml, lzma }: stdenv.mkDerivation rec { - version = "20130507"; - checkout = "25/50225/2"; + version = "20171023"; + checkout = "8122e0b8b13794"; name = "vboot_reference-${version}"; src = fetchgit { url = https://chromium.googlesource.com/chromiumos/platform/vboot_reference; - rev = "refs/changes/${checkout}"; - sha256 = "14d3a93ha5k4al4ib43nyn1ppx7kgb12xw6mkflhx8nxmx8827nc"; + rev = "${checkout}"; + sha256 = "0qxm3qlvm2fgjrn9b3n8rdccw2f5pdi7z542m2hdfddflx7jz1w7"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openssl stdenv.cc.libc.static ] - ++ stdenv.lib.optional (libuuid != null) - (libuuid.overrideAttrs (attrs: - { configureFlags = attrs.configureFlags ++ [ "--enable-static" ]; })); + buildInputs = [ openssl libuuid libyaml lzma ]; - arch = if stdenv.system == "x86_64-linux" then "x86_64" - else if stdenv.system == "i686-linux" then "x86" - else throw "vboot_reference for: ${stdenv.system} not supported!"; + enableParallelBuilding = true; buildPhase = '' - make ARCH=${arch} `pwd`/build/cgpt/cgpt - make ARCH=${arch} `pwd`/build/utility/vbutil_kernel - make ARCH=${arch} `pwd`/build/utility/vbutil_key - make ARCH=${arch} `pwd`/build/utility/vbutil_keyblock - make ARCH=${arch} `pwd`/build/utility/vbutil_firmware + patchShebangs scripts + make -j''${NIX_BUILD_CORES:-1} \ + `pwd`/build/cgpt/cgpt \ + `pwd`/build/futility/futility ''; installPhase = '' mkdir -p $out/bin cp build/cgpt/cgpt $out/bin - cp build/utility/vbutil_kernel $out/bin - cp build/utility/vbutil_key $out/bin - cp build/utility/vbutil_keyblock $out/bin - cp build/utility/vbutil_firmware $out/bin + cp build/futility/futility $out/bin + mkdir -p $out/share/vboot + cp -r tests/devkeys* $out/share/vboot/ ''; meta = { |