coreboot-utils: 4.14 -> 4.19

jmbaur · jmbaur · commit a4c91d198cf2 · 2023-03-06T18:14:41.000-08:00
Utils changes: - https://review.coreboot.org/plugins/gitiles/coreboot/+/4d661eebe95b06acae7d99777ed36ba56a560112/Documentation/releases/coreboot-4.19-relnotes.md#additional-coreboot-changes - https://review.coreboot.org/plugins/gitiles/coreboot/+/4d661eebe95b06acae7d99777ed36ba56a560112/Documentation/releases/coreboot-4.17-relnotes.md#util_cbmem_add-flamegraph_compatible-timestamps-output - https://review.coreboot.org/plugins/gitiles/coreboot/+/4d661eebe95b06acae7d99777ed36ba56a560112/Documentation/releases/coreboot-4.17-relnotes.md#util_cbmem_add-an-option-to-append-timestamp
diff --git a/pkgs/tools/misc/coreboot-utils/default.nix b/pkgs/tools/misc/coreboot-utils/default.nix
@@ -1,7 +1,7 @@
-{ lib, stdenv, fetchurl, zlib, pciutils, coreutils, acpica-tools, makeWrapper, gnugrep, gnused, file, buildEnv }:
+{ lib, stdenv, fetchurl, pkg-config, zlib, pciutils, openssl, coreutils, acpica-tools, makeWrapper, gnugrep, gnused, file, buildEnv }:
 
 let
-  version = "4.14";
+  version = "4.19";
 
   commonMeta = with lib; {
     description = "Various coreboot-related tools";
@@ -16,7 +16,7 @@ let
 
     src = fetchurl {
       url = "https://coreboot.org/releases/coreboot-${version}.tar.xz";
-      sha256 = "0viw2x4ckjwiylb92w85k06b0g9pmamjy2yqs7fxfqbmfadkf1yr";
+      sha256 = "sha256-Zcyy9GU1uZbgBmobdvgcjPH/PiffhLP5fYrXs+fPCkM=";
     };
 
     enableParallelBuilding = true;
@@ -32,7 +32,7 @@ let
     ];
 
     meta = commonMeta // args.meta;
-  } // (removeAttrs args ["meta"]));
+  } // (removeAttrs args [ "meta" ]));
 
   utils = {
     msrtool = generic {
@@ -84,6 +84,8 @@ let
     amdfwtool = generic {
       pname = "amdfwtool";
       meta.description = "Create AMD firmware combination";
+      buildInputs = [ openssl ];
+      nativeBuildInputs = [ pkg-config ];
       installPhase = ''
         runHook preInstall
 
@@ -105,13 +107,15 @@ let
 
         runHook postInstall
       '';
-      postFixup = let
-        binPath = [ coreutils acpica-tools gnugrep gnused file ];
-      in "wrapProgram $out/bin/acpidump-all --set PATH ${lib.makeBinPath binPath}";
+      postFixup = ''
+        wrapProgram $out/bin/acpidump-all \
+          --set PATH ${lib.makeBinPath [ coreutils acpica-tools gnugrep gnused file ]}
+      '';
     };
   };
 
-in utils // {
+in
+utils // {
   coreboot-utils = (buildEnv {
     name = "coreboot-utils-${version}";
     paths = lib.attrValues utils;
