summary refs log tree commit diff
path: root/pkgs/top-level/all-packages.nix
diff options
context:
space:
mode:
authorMatthieu Coudron <mattator@gmail.com>2018-01-29 03:50:18 +0900
committerMatthieu Coudron <mattator@gmail.com>2018-02-07 10:07:13 +0900
commitf620b1b693ec25af1aadcb0508710dc22e92453a (patch)
tree9b5260147aed77ad4e3696e1b0c400fbe95734fc /pkgs/top-level/all-packages.nix
parentd80057f245e65e5ef07ec7e488941ac3d4fc3ee3 (diff)
downloadnixlib-f620b1b693ec25af1aadcb0508710dc22e92453a.tar
nixlib-f620b1b693ec25af1aadcb0508710dc22e92453a.tar.gz
nixlib-f620b1b693ec25af1aadcb0508710dc22e92453a.tar.bz2
nixlib-f620b1b693ec25af1aadcb0508710dc22e92453a.tar.lz
nixlib-f620b1b693ec25af1aadcb0508710dc22e92453a.tar.xz
nixlib-f620b1b693ec25af1aadcb0508710dc22e92453a.tar.zst
nixlib-f620b1b693ec25af1aadcb0508710dc22e92453a.zip
kernel: buildLinux replaces import ./generic.nix
- defined buildLinux as generic.nix instead of manual-config.nix. This
makes kernel derivations a tad more similar to your typical derivations.
- moved $buildRoot to within the source folder, this way it doesn't have to be created before the unpackPhase
and make it easier to work on kernel source without running the unpackPhase
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r--pkgs/top-level/all-packages.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 92f81ee28613..d48336fa4e3a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13197,7 +13197,7 @@ with pkgs;
 
   # A function to build a manually-configured kernel
   linuxManualConfig = pkgs.buildLinux;
-  buildLinux = makeOverridable (callPackage ../os-specific/linux/kernel/manual-config.nix {});
+  buildLinux = makeOverridable (callPackage ../os-specific/linux/kernel/generic.nix {});
 
   keyutils = callPackage ../os-specific/linux/keyutils { };