From 361fef520190a28a0434274b3f13525138179453 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 8 Aug 2021 14:42:48 +0200 Subject: [PATCH] fwts: cleanup --- pkgs/os-specific/linux/fwts/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix index 1b5a0e3bdff..d937d4b75f6 100644 --- a/pkgs/os-specific/linux/fwts/default.nix +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, autoreconfHook, pkg-config, glib, libtool, pcre +{ lib, stdenv, fetchzip, autoreconfHook, pkg-config, glib, pcre , json_c, flex, bison, dtc, pciutils, dmidecode, iasl, libbsd }: stdenv.mkDerivation rec { @@ -6,18 +6,19 @@ stdenv.mkDerivation rec { version = "20.11.00"; src = fetchzip { - url = "http://fwts.ubuntu.com/release/${pname}-V${version}.tar.gz"; + url = "https://fwts.ubuntu.com/release/${pname}-V${version}.tar.gz"; sha256 = "0s8iz6c9qhyndcsjscs3qail2mzfywpbiys1x232igm5kl089vvr"; stripRoot = false; }; - nativeBuildInputs = [ autoreconfHook pkg-config libtool ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ glib pcre json_c flex bison dtc pciutils dmidecode iasl libbsd ]; postPatch = '' - substituteInPlace src/lib/include/fwts_binpaths.h --replace "/usr/bin/lspci" "${pciutils}/bin/lspci" - substituteInPlace src/lib/include/fwts_binpaths.h --replace "/usr/sbin/dmidecode" "${dmidecode}/bin/dmidecode" - substituteInPlace src/lib/include/fwts_binpaths.h --replace "/usr/bin/iasl" "${iasl}/bin/iasl" + 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" "${iasl}/bin/iasl" ''; enableParallelBuilding = true;