diff options
author | Nikolay Amiantov <ab@fmap.me> | 2016-04-13 15:53:51 +0300 |
---|---|---|
committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-13 22:09:41 +0300 |
commit | 8b7ebaffeb3087ef18ff5c0f38cc3f44f7f8124e (patch) | |
tree | 8bab721107fae818dad896a0876d50d3d0a0d981 /nixos/modules/virtualisation | |
parent | e26119619f7ce64b065e692ba0cd31f53b9ef637 (diff) | |
download | nixlib-8b7ebaffeb3087ef18ff5c0f38cc3f44f7f8124e.tar nixlib-8b7ebaffeb3087ef18ff5c0f38cc3f44f7f8124e.tar.gz nixlib-8b7ebaffeb3087ef18ff5c0f38cc3f44f7f8124e.tar.bz2 nixlib-8b7ebaffeb3087ef18ff5c0f38cc3f44f7f8124e.tar.lz nixlib-8b7ebaffeb3087ef18ff5c0f38cc3f44f7f8124e.tar.xz nixlib-8b7ebaffeb3087ef18ff5c0f38cc3f44f7f8124e.tar.zst nixlib-8b7ebaffeb3087ef18ff5c0f38cc3f44f7f8124e.zip |
replace makeSearchPath tree-wise to take care of possible multiple outputs
Diffstat (limited to 'nixos/modules/virtualisation')
-rw-r--r-- | nixos/modules/virtualisation/azure-agent.nix | 2 | ||||
-rw-r--r-- | nixos/modules/virtualisation/virtualbox-guest.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/virtualisation/azure-agent.nix b/nixos/modules/virtualisation/azure-agent.nix index da97565fd6de..a89cd454dc73 100644 --- a/nixos/modules/virtualisation/azure-agent.nix +++ b/nixos/modules/virtualisation/azure-agent.nix @@ -42,7 +42,7 @@ let wrapProgram "$out/bin/waagent" \ --prefix PYTHONPATH : $PYTHONPATH \ - --prefix PATH : "${makeSearchPath "bin" runtimeDeps}" + --prefix PATH : "${makeBinPath runtimeDeps}" ''; }; diff --git a/nixos/modules/virtualisation/virtualbox-guest.nix b/nixos/modules/virtualisation/virtualbox-guest.nix index 9733bd6fac46..3a10871ce840 100644 --- a/nixos/modules/virtualisation/virtualbox-guest.nix +++ b/nixos/modules/virtualisation/virtualbox-guest.nix @@ -66,7 +66,7 @@ in services.xserver.displayManager.sessionCommands = '' - PATH=${makeSearchPath "bin" [ pkgs.gnugrep pkgs.which pkgs.xorg.xorgserver.out ]}:$PATH \ + PATH=${makeBinPath [ pkgs.gnugrep pkgs.which pkgs.xorg.xorgserver.out ]}:$PATH \ ${kernel.virtualboxGuestAdditions}/bin/VBoxClient-all ''; |