diff options
| author | obadz <obadz-git@obadz.com> | 2016-08-23 18:50:06 +0100 |
|---|---|---|
| committer | obadz <obadz-git@obadz.com> | 2016-08-23 18:50:06 +0100 |
| commit | 0e8d2725dcc1aef5c56e63c939249b27190f6367 (patch) | |
| tree | 654e83b5f539b31947ee5011a0d1df797bf4c75d /nixos/tests | |
| parent | 13c04c837db0f69705cfa4478c513b2230243ca2 (diff) | |
| parent | 415e1983ca650777d476d39de1db61a9e9877621 (diff) | |
| download | nixpkgs-0e8d2725dcc1aef5c56e63c939249b27190f6367.tar nixpkgs-0e8d2725dcc1aef5c56e63c939249b27190f6367.tar.gz nixpkgs-0e8d2725dcc1aef5c56e63c939249b27190f6367.tar.bz2 nixpkgs-0e8d2725dcc1aef5c56e63c939249b27190f6367.tar.lz nixpkgs-0e8d2725dcc1aef5c56e63c939249b27190f6367.tar.xz nixpkgs-0e8d2725dcc1aef5c56e63c939249b27190f6367.tar.zst nixpkgs-0e8d2725dcc1aef5c56e63c939249b27190f6367.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'nixos/tests')
| -rw-r--r-- | nixos/tests/virtualbox.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index e9bc14a6cdb..e85ff238089 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -4,12 +4,12 @@ with import ../lib/testing.nix { inherit system; }; with pkgs.lib; let - testVMConfig = vmName: attrs: { config, pkgs, ... }: let + testVMConfig = vmName: attrs: { config, pkgs, lib, ... }: let guestAdditions = pkgs.linuxPackages.virtualboxGuestAdditions; miniInit = '' #!${pkgs.stdenv.shell} -xe - export PATH="${pkgs.coreutils}/bin:${pkgs.utillinux}/bin" + export PATH="${lib.makeBinPath [ pkgs.coreutils pkgs.utillinux ]}" mkdir -p /var/run/dbus cat > /etc/passwd <<EOF |