about summary refs log tree commit diff
path: root/tests/programs
diff options
context:
space:
mode:
authoraszlig <aszlig@nix.build>2018-04-03 04:00:20 +0200
committeraszlig <aszlig@nix.build>2018-04-03 04:00:20 +0200
commit7b7f782c93fafe2c42f882b933cf49ba99e3e3bc (patch)
treef59576b4b22cc42c7747c9dd29be704a8e58f831 /tests/programs
parente603e0fd1ed6e919beb8d31d3c69ad70f002f539 (diff)
tests: Properly propagate nixpkgs path
Yet another occasion where we import nixpkgs-path.nix unconditionally,
so let's actually pass a nixpkgsPath to every test function.

Signed-off-by: aszlig <aszlig@nix.build>
Diffstat (limited to 'tests/programs')
-rw-r--r--tests/programs/gnupg/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/programs/gnupg/default.nix b/tests/programs/gnupg/default.nix
index 24756a3e..43ba9f05 100644
--- a/tests/programs/gnupg/default.nix
+++ b/tests/programs/gnupg/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, nixpkgsPath, ... }:
 
 let
   mkExpect = expectScript: script: pkgs.writeScript "test-gnupg-cli" ''
@@ -27,7 +27,7 @@ in {
 
   machine = { lib, ... }: {
     imports = map (what:
-      "${import ../../../nixpkgs-path.nix}/nixos/tests/common/${what}.nix"
+      "${nixpkgsPath}/nixos/tests/common/${what}.nix"
     ) [ "user-account" "x11" ];
 
     services.openssh.enable = true;