From 72e242d5215a7a9e4f60b68f940ccf1cec455a87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Sat, 18 Jul 2020 23:56:29 +0200 Subject: [PATCH] coreboot-utils: include common meta attrs for all --- pkgs/tools/misc/coreboot-utils/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/coreboot-utils/default.nix b/pkgs/tools/misc/coreboot-utils/default.nix index 533b4eefc2a..39e2e041e32 100644 --- a/pkgs/tools/misc/coreboot-utils/default.nix +++ b/pkgs/tools/misc/coreboot-utils/default.nix @@ -3,7 +3,7 @@ let version = "4.12"; - meta = with stdenv.lib; { + commonMeta = with stdenv.lib; { description = "Various coreboot-related tools"; homepage = "https://www.coreboot.org"; license = licenses.gpl2; @@ -12,7 +12,7 @@ let }; generic = { pname, path ? "util/${pname}", ... }@args: stdenv.mkDerivation (rec { - inherit pname version meta; + inherit pname version; src = fetchurl { url = "https://coreboot.org/releases/coreboot-${version}.tar.xz"; @@ -29,7 +29,9 @@ let "INSTALL=install" "PREFIX=${placeholder "out"}" ]; - } // args); + + meta = commonMeta // args.meta; + } // (removeAttrs args ["meta"])); utils = { msrtool = generic { @@ -99,6 +101,7 @@ in utils // { paths = stdenv.lib.attrValues utils; postBuild = "rm -rf $out/sbin"; }) // { - inherit meta version; + inherit version; + meta = commonMeta; }; }