From 8b7ebaffeb3087ef18ff5c0f38cc3f44f7f8124e Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 13 Apr 2016 15:53:51 +0300
Subject: replace makeSearchPath tree-wise to take care of possible multiple
 outputs

---
 nixos/modules/services/misc/octoprint.nix                     | 2 +-
 nixos/modules/services/web-servers/apache-httpd/trac.nix      | 2 +-
 nixos/modules/services/x11/desktop-managers/enlightenment.nix | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'nixos/modules/services')

diff --git a/nixos/modules/services/misc/octoprint.nix b/nixos/modules/services/misc/octoprint.nix
index 8ab2a9307a7..c0af3587205 100644
--- a/nixos/modules/services/misc/octoprint.nix
+++ b/nixos/modules/services/misc/octoprint.nix
@@ -102,7 +102,7 @@ in
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
       path = [ pluginsEnv ];
-      environment.PYTHONPATH = makeSearchPath pkgs.python.sitePackages [ pluginsEnv ];
+      environment.PYTHONPATH = makeSearchPathOutputs pkgs.python.sitePackages ["lib"] [ pluginsEnv ];
 
       preStart = ''
         mkdir -p "${cfg.stateDir}"
diff --git a/nixos/modules/services/web-servers/apache-httpd/trac.nix b/nixos/modules/services/web-servers/apache-httpd/trac.nix
index c5c11029010..c4aa6b6ad3a 100644
--- a/nixos/modules/services/web-servers/apache-httpd/trac.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/trac.nix
@@ -96,7 +96,7 @@ in
   globalEnvVars = singleton
     { name = "PYTHONPATH";
       value =
-        makeSearchPath "lib/${pkgs.python.libPrefix}/site-packages"
+        makeSearchPathOutputs "lib/${pkgs.python.libPrefix}/site-packages" ["lib"]
           [ pkgs.mod_python
             pkgs.pythonPackages.trac
             pkgs.setuptools
diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
index c981b40f74a..11df7297833 100644
--- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix
+++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
@@ -7,7 +7,7 @@ let
   e = pkgs.enlightenment;
   xcfg = config.services.xserver;
   cfg = xcfg.desktopManager.enlightenment;
-  GST_PLUGIN_PATH = lib.makeSearchPath "lib/gstreamer-1.0" [
+  GST_PLUGIN_PATH = lib.makeSearchPathOutputs "lib/gstreamer-1.0" ["lib"] [
     pkgs.gst_all_1.gst-plugins-base
     pkgs.gst_all_1.gst-plugins-good
     pkgs.gst_all_1.gst-plugins-bad
-- 
cgit 1.4.1