From ab0a0c004e1076315c8ed910437e6cf9c2f087ff Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 14 Apr 2016 18:14:28 +0300 Subject: makeSearchPathOutputs: refactor to makeSearchPathOutput --- nixos/modules/services/web-servers/apache-httpd/trac.nix | 2 +- nixos/modules/services/x11/desktop-managers/enlightenment.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'nixos/modules/services') diff --git a/nixos/modules/services/web-servers/apache-httpd/trac.nix b/nixos/modules/services/web-servers/apache-httpd/trac.nix index c4aa6b6ad3a3..3196edc2838b 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 = - makeSearchPathOutputs "lib/${pkgs.python.libPrefix}/site-packages" ["lib"] + makeSearchPathOutput "lib" "lib/${pkgs.python.libPrefix}/site-packages" [ 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 11df7297833b..2e788d869607 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.makeSearchPathOutputs "lib/gstreamer-1.0" ["lib"] [ + GST_PLUGIN_PATH = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" [ 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 From 5ede7d4d925542da9315b659afbe16b90613414e Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 20 Apr 2016 17:41:36 +0300 Subject: octoprint: use makeSearchPathOutput --- nixos/modules/services/misc/octoprint.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nixos/modules/services') diff --git a/nixos/modules/services/misc/octoprint.nix b/nixos/modules/services/misc/octoprint.nix index 8d46bca99f99..c2b3f63be7d4 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 = makeSearchPathOutputs pkgs.python.sitePackages ["lib"] [ pluginsEnv ]; + environment.PYTHONPATH = makeSearchPathOutput "lib" pkgs.python.sitePackages [ pluginsEnv ]; preStart = '' mkdir -p "${cfg.stateDir}" -- cgit 1.4.1