diff options
| author | Ben Wolsieffer <benwolsieffer@gmail.com> | 2018-01-15 12:55:24 -0500 |
|---|---|---|
| committer | Ben Wolsieffer <benwolsieffer@gmail.com> | 2018-01-15 12:55:24 -0500 |
| commit | 80f6b8e2ba354f85b48622acf56dde86db0c4e29 (patch) | |
| tree | 0c75d6cb625aafba433d132af605fca09b3f1619 | |
| parent | 92083c3f404620b1e0260946f3330848fdbc1e6b (diff) | |
| download | nixlib-80f6b8e2ba354f85b48622acf56dde86db0c4e29.tar nixlib-80f6b8e2ba354f85b48622acf56dde86db0c4e29.tar.gz nixlib-80f6b8e2ba354f85b48622acf56dde86db0c4e29.tar.bz2 nixlib-80f6b8e2ba354f85b48622acf56dde86db0c4e29.tar.lz nixlib-80f6b8e2ba354f85b48622acf56dde86db0c4e29.tar.xz nixlib-80f6b8e2ba354f85b48622acf56dde86db0c4e29.tar.zst nixlib-80f6b8e2ba354f85b48622acf56dde86db0c4e29.zip | |
kernel: revert seemingly incorrect change to extraMeta merging
| -rw-r--r-- | pkgs/os-specific/linux/kernel/manual-config.nix | 4 |
1 files 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; |