diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2019-02-01 09:42:53 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2019-02-01 09:42:53 +0100 |
| commit | 8ba516664bf367889b06b06e4122372f82f24feb (patch) | |
| tree | 01b691a7e1ad4797843b4c93d8a9d74fd16311d7 /pkgs/build-support/vm | |
| parent | d00ca4476cd91bae052e8ded4d94e124a353d091 (diff) | |
| parent | 5effa4e0f98b317fe4607b1a6548811017c3325d (diff) | |
| download | nixpkgs-8ba516664bf367889b06b06e4122372f82f24feb.tar nixpkgs-8ba516664bf367889b06b06e4122372f82f24feb.tar.gz nixpkgs-8ba516664bf367889b06b06e4122372f82f24feb.tar.bz2 nixpkgs-8ba516664bf367889b06b06e4122372f82f24feb.tar.lz nixpkgs-8ba516664bf367889b06b06e4122372f82f24feb.tar.xz nixpkgs-8ba516664bf367889b06b06e4122372f82f24feb.tar.zst nixpkgs-8ba516664bf367889b06b06e4122372f82f24feb.zip | |
Merge branch 'staging-next' into staging
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 bd4465e93a1..d6feb7e9ded 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 #! ${bash}/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 |