From 80f6b8e2ba354f85b48622acf56dde86db0c4e29 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Mon, 15 Jan 2018 12:55:24 -0500 Subject: [PATCH] kernel: revert seemingly incorrect change to extraMeta merging --- pkgs/os-specific/linux/kernel/manual-config.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 1defd4099a61..6c598e50a0aa 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -225,8 +225,8 @@ let maintainers.thoughtpolice ]; platforms = platforms.linux; - }; - } // extraMeta; + } // extraMeta; + }; in assert stdenv.lib.versionAtLeast version "4.14" -> libelf != null;