From f3785b42e8ee7dc6e9a9bcced86d13188c4fbfc4 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 25 Jan 2025 11:33:14 +0100 Subject: [PATCH] fwts: refactor --- pkgs/os-specific/linux/fwts/default.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix index c52dd1844fec..515669921d70 100644 --- a/pkgs/os-specific/linux/fwts/default.nix +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { version = "24.09.00"; src = fetchzip { - url = "https://fwts.ubuntu.com/release/${pname}-V${version}.tar.gz"; - sha256 = "sha256-ZJSlx8O38e7bJYTgZacayslr28TLHHJsISXq9Uzsnyc="; + url = "https://fwts.ubuntu.com/release/fwts-V${version}.tar.gz"; + hash = "sha256-ZJSlx8O38e7bJYTgZacayslr28TLHHJsISXq9Uzsnyc="; stripRoot = false; }; @@ -49,22 +49,22 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/lib/include/fwts_binpaths.h \ - --replace "/usr/bin/lspci" "${pciutils}/bin/lspci" \ - --replace "/usr/sbin/dmidecode" "${dmidecode}/bin/dmidecode" \ - --replace "/usr/bin/iasl" "${acpica-tools}/bin/iasl" + --replace-fail "/usr/bin/lspci" "${pciutils}/bin/lspci" \ + --replace-fail "/usr/sbin/dmidecode" "${dmidecode}/bin/dmidecode" \ + --replace-fail "/usr/bin/iasl" "${acpica-tools}/bin/iasl" substituteInPlace src/lib/src/fwts_devicetree.c \ src/devicetree/dt_base/dt_base.c \ - --replace "dtc -I" "${dtc}/bin/dtc -I" + --replace-fail "dtc -I" "${dtc}/bin/dtc -I" ''; enableParallelBuilding = true; - meta = with lib; { + meta = { homepage = "https://wiki.ubuntu.com/FirmwareTestSuite"; description = "Firmware Test Suite"; - platforms = platforms.linux; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ tadfisher ]; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ tadfisher ]; }; }