diff options
| author | volth <volth@webmaster.ms> | 2019-01-29 20:17:44 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-29 20:17:44 +0000 |
| commit | e64a5516036c03ef91ed0f0e45287462e09c6684 (patch) | |
| tree | d9f908da72500a961595f0cff7414572f10b2ca1 /pkgs/build-support/vm | |
| parent | 2564e780b571774f1da5efdb2e1e4710ab9c3448 (diff) | |
| download | nixpkgs-e64a5516036c03ef91ed0f0e45287462e09c6684.tar nixpkgs-e64a5516036c03ef91ed0f0e45287462e09c6684.tar.gz nixpkgs-e64a5516036c03ef91ed0f0e45287462e09c6684.tar.bz2 nixpkgs-e64a5516036c03ef91ed0f0e45287462e09c6684.tar.lz nixpkgs-e64a5516036c03ef91ed0f0e45287462e09c6684.tar.xz nixpkgs-e64a5516036c03ef91ed0f0e45287462e09c6684.tar.zst nixpkgs-e64a5516036c03ef91ed0f0e45287462e09c6684.zip | |
runInLinuxVM: pkgs.linux -> kernel
There is a function params `kernel' intended to specify which kernel to use. It defaults to `pkgs.linux`. But when we override `kernel', compiling and using two kernels seems not to be the intendend bevavior.
Diffstat (limited to 'pkgs/build-support/vm')
| -rw-r--r-- | pkgs/build-support/vm/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 7880d98e6b6..6c48fb02b19 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -162,7 +162,7 @@ rec { fi # Set up automatic kernel module loading. - export MODULE_DIR=${linux}/lib/modules/ + export MODULE_DIR=${kernel}/lib/modules/ ${coreutils}/bin/cat <<EOF > /run/modprobe #! /bin/sh export MODULE_DIR=$MODULE_DIR @@ -315,7 +315,7 @@ rec { name = "extract-file"; buildInputs = [ utillinux ]; buildCommand = '' - ln -s ${linux}/lib /lib + ln -s ${kernel}/lib /lib ${kmod}/bin/modprobe loop ${kmod}/bin/modprobe ext4 ${kmod}/bin/modprobe hfs @@ -340,7 +340,7 @@ rec { name = "extract-file-mtd"; buildInputs = [ utillinux mtdutils ]; buildCommand = '' - ln -s ${linux}/lib /lib + ln -s ${kernel}/lib /lib ${kmod}/bin/modprobe mtd ${kmod}/bin/modprobe mtdram total_size=131072 ${kmod}/bin/modprobe mtdchar |