From c4405f54375592c080ebd8eb675432b2b5337f81 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 1 Mar 2013 06:06:45 +0100 Subject: dnyarri+mmrnmhrm: Use inherit for kernel src info. No changes in functionality, only style change, as using inherit is much easier on the eyes than repeating those attributes twice. Signed-off-by: aszlig --- machines/dnyarri.nix | 4 ++-- machines/mmrnmhrm.nix | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/machines/dnyarri.nix b/machines/dnyarri.nix index 221f9422..ccbc97e0 100644 --- a/machines/dnyarri.nix +++ b/machines/dnyarri.nix @@ -40,8 +40,8 @@ with import ../lib; ]; linuxAszlig = pkgs.linuxManualConfig { - version = pkgs.kernelSourceAszlig.version; - src = pkgs.kernelSourceAszlig.src; + inherit (pkgs.kernelSourceAszlig) version src; + configfile = pkgs.substituteAll { name = "aszlig-with-firmware.kconf"; src = generateKConf (import ./dnyarri-kconf.nix); diff --git a/machines/mmrnmhrm.nix b/machines/mmrnmhrm.nix index bcaddc6e..16b5526e 100644 --- a/machines/mmrnmhrm.nix +++ b/machines/mmrnmhrm.nix @@ -8,8 +8,7 @@ with import ../lib; boot = let linuxAszlig = pkgs.linuxManualConfig { - version = pkgs.kernelSourceAszlig.version; - src = pkgs.kernelSourceAszlig.src; + inherit (pkgs.kernelSourceAszlig) version src; configfile = generateKConf (import ./mmrnmhrm-kconf.nix); allowImportFromDerivation = true; -- cgit 1.4.1