Skip to content

Commit 3293269

Browse files
authored
fwts: refactor, unpin gnumake42 (#376645)
2 parents 0542e87 + 3045853 commit 3293269

File tree

1 file changed

+44
-15
lines changed

1 file changed

+44
-15
lines changed

Diff for: pkgs/os-specific/linux/fwts/default.nix

+44-15
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,67 @@
1-
{ lib, stdenv, fetchzip, autoreconfHook, pkg-config, gnumake42, glib, pcre
2-
, json_c, flex, bison, dtc, pciutils, dmidecode, acpica-tools, libbsd }:
1+
{
2+
lib,
3+
stdenv,
4+
fetchzip,
5+
autoreconfHook,
6+
pkg-config,
7+
glib,
8+
pcre,
9+
json_c,
10+
flex,
11+
bison,
12+
dtc,
13+
pciutils,
14+
dmidecode,
15+
acpica-tools,
16+
libbsd,
17+
}:
318

419
stdenv.mkDerivation rec {
520
pname = "fwts";
621
version = "24.09.00";
722

823
src = fetchzip {
9-
url = "https://fwts.ubuntu.com/release/${pname}-V${version}.tar.gz";
10-
sha256 = "sha256-ZJSlx8O38e7bJYTgZacayslr28TLHHJsISXq9Uzsnyc=";
24+
url = "https://fwts.ubuntu.com/release/fwts-V${version}.tar.gz";
25+
hash = "sha256-ZJSlx8O38e7bJYTgZacayslr28TLHHJsISXq9Uzsnyc=";
1126
stripRoot = false;
1227
};
1328

14-
# fails with make 4.4
15-
nativeBuildInputs = [ autoreconfHook pkg-config gnumake42 ];
16-
buildInputs = [ glib pcre json_c flex bison dtc pciutils dmidecode acpica-tools libbsd ];
29+
nativeBuildInputs = [
30+
autoreconfHook
31+
pkg-config
32+
];
33+
34+
buildInputs = [
35+
glib
36+
pcre
37+
json_c
38+
flex
39+
bison
40+
dtc
41+
pciutils
42+
dmidecode
43+
acpica-tools
44+
libbsd
45+
];
1746

1847
postPatch = ''
1948
substituteInPlace src/lib/include/fwts_binpaths.h \
20-
--replace "/usr/bin/lspci" "${pciutils}/bin/lspci" \
21-
--replace "/usr/sbin/dmidecode" "${dmidecode}/bin/dmidecode" \
22-
--replace "/usr/bin/iasl" "${acpica-tools}/bin/iasl"
49+
--replace-fail "/usr/bin/lspci" "${pciutils}/bin/lspci" \
50+
--replace-fail "/usr/sbin/dmidecode" "${dmidecode}/bin/dmidecode" \
51+
--replace-fail "/usr/bin/iasl" "${acpica-tools}/bin/iasl"
2352
2453
substituteInPlace src/lib/src/fwts_devicetree.c \
2554
src/devicetree/dt_base/dt_base.c \
26-
--replace "dtc -I" "${dtc}/bin/dtc -I"
55+
--replace-fail "dtc -I" "${dtc}/bin/dtc -I"
2756
'';
2857

2958
enableParallelBuilding = true;
3059

31-
meta = with lib; {
60+
meta = {
3261
homepage = "https://wiki.ubuntu.com/FirmwareTestSuite";
3362
description = "Firmware Test Suite";
34-
platforms = platforms.linux;
35-
license = licenses.gpl2Plus;
36-
maintainers = with maintainers; [ tadfisher ];
63+
platforms = lib.platforms.linux;
64+
license = lib.licenses.gpl2Plus;
65+
maintainers = with lib.maintainers; [ tadfisher ];
3766
};
3867
}

0 commit comments

Comments
 (0)