diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-12-04 09:33:39 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-12-04 09:33:39 +0100 |
commit | 13797ff5224817abcb05926de842eb4e0fb41382 (patch) | |
tree | 4183d237a06f5aef217d2223729ba6ce17378c2f /pkgs/os-specific/linux/kernel/generic.nix | |
parent | 561de381bcccfe6792f2908a5022449a05ae0050 (diff) | |
download | nixpkgs-13797ff5224817abcb05926de842eb4e0fb41382.tar nixpkgs-13797ff5224817abcb05926de842eb4e0fb41382.tar.gz nixpkgs-13797ff5224817abcb05926de842eb4e0fb41382.tar.bz2 nixpkgs-13797ff5224817abcb05926de842eb4e0fb41382.tar.lz nixpkgs-13797ff5224817abcb05926de842eb4e0fb41382.tar.xz nixpkgs-13797ff5224817abcb05926de842eb4e0fb41382.tar.zst nixpkgs-13797ff5224817abcb05926de842eb4e0fb41382.zip |
linux-4.13: mark as insecure (+required generic changes)
extraMeta was being fed as passthru without being processed by stdenv, so without those changes, adding the security attribute would be useless.
Diffstat (limited to 'pkgs/os-specific/linux/kernel/generic.nix')
-rw-r--r-- | pkgs/os-specific/linux/kernel/generic.nix | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index c2f4e6843f5..0d2b7655edb 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -118,7 +118,7 @@ let }; kernel = buildLinux { - inherit version modDirVersion src kernelPatches stdenv; + inherit version modDirVersion src kernelPatches stdenv extraMeta; configfile = configfile.nativeDrv or configfile; @@ -131,10 +131,7 @@ let passthru = { features = kernelFeatures; - - meta = kernel.meta // extraMeta; - - passthru = kernel.passthru // (removeAttrs passthru [ "passthru" "meta" ]); + passthru = kernel.passthru // (removeAttrs passthru [ "passthru" ]); }; nativeDrv = lib.addPassthru kernel.nativeDrv passthru; |