diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix index 6fd7dc8e99d1..13560cd6a965 100644 --- a/pkgs/os-specific/linux/fwts/default.nix +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -16,16 +16,18 @@ libbsd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fwts"; - version = "24.09.00"; + version = "25.09.00"; src = fetchzip { - url = "https://fwts.ubuntu.com/release/fwts-V${version}.tar.gz"; - hash = "sha256-ZJSlx8O38e7bJYTgZacayslr28TLHHJsISXq9Uzsnyc="; + url = "https://fwts.ubuntu.com/release/fwts-V${finalAttrs.version}.tar.gz"; + hash = "sha256-OJI2O9MptckmGj4rTrh9haIGaXJOO3er59yIorbgSVw="; stripRoot = false; }; + sourceRoot = "${finalAttrs.src.name}/fwts-${finalAttrs.version}"; + nativeBuildInputs = [ autoreconfHook pkg-config @@ -64,4 +66,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ tadfisher ]; }; -} +}) diff --git a/pkgs/os-specific/linux/fwts/module.nix b/pkgs/os-specific/linux/fwts/module.nix index 76326198b8be..922abd9019ec 100644 --- a/pkgs/os-specific/linux/fwts/module.nix +++ b/pkgs/os-specific/linux/fwts/module.nix @@ -6,13 +6,13 @@ kernelModuleMakeFlags, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fwts-efi-runtime"; version = "${fwts.version}-${kernel.version}"; inherit (fwts) src; - sourceRoot = "${src.name}/efi_runtime"; + sourceRoot = "${fwts.sourceRoot}/efi_runtime"; postPatch = '' substituteInPlace Makefile --replace \ @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ dtzWill ]; platforms = platforms.linux; }; -} +})