summaryrefslogtreecommitdiff
path: root/nix
diff options
context:
space:
mode:
authorPetr Rockai <prockai@redhat.com>2014-04-26 13:45:23 +0200
committerPetr Rockai <prockai@redhat.com>2014-04-26 13:46:25 +0200
commit75d399800ab60264d1201ad3fa1f9283542459f6 (patch)
tree7a1ae1a633fb8e748007e3b371960761f4ee50e7 /nix
parent3bce3ad52a6c1fafd55573c465486faed3bb0a77 (diff)
downloadlvm2-75d399800ab60264d1201ad3fa1f9283542459f6.tar.gz
NIX: Use VM images with the correct root module list.
Diffstat (limited to 'nix')
-rw-r--r--nix/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/nix/default.nix b/nix/default.nix
index faf179a32..228047f3d 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -147,10 +147,10 @@ let
[ "loop" "dm_mod" "dm_snapshot" "dm_mirror" "dm_zero" "dm_raid" "dm_thin_pool" ]; };
release = import "${nixpkgs}/pkgs/build-support/release/default.nix" {
pkgs = pkgs // { vmTools = tools; }; };
- imgs = pkgs.vmTools.diskImageFuns //
+ imgs = tools.diskImageFuns //
mapAttrs (n: a: b: pkgs.vmTools.makeImageFromRPMDist (a // b)) extra_distros;
- rpmdistros = pkgs.vmTools.rpmDistros // extra_distros;
- rpmbuild = pkgs.vmTools.buildRPM;
+ rpmdistros = tools.rpmDistros // extra_distros;
+ rpmbuild = tools.buildRPM;
};
extra_rpms = rec {