diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-04-25 18:02:23 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-25 18:02:23 +0300 |
| commit | 5f19542581ed03b5059ffb78113b99f190cc6b29 (patch) | |
| tree | db584519d534b555ee7629efa2b3ec19d4b01f58 /nixos/modules/services | |
| parent | 09f02b918ec4df875326e3addcdb99343c976a78 (diff) | |
| parent | 69a072484dd9ee04c68a3bf3ce5a1bdb111a9229 (diff) | |
| download | nixlib-5f19542581ed03b5059ffb78113b99f190cc6b29.tar nixlib-5f19542581ed03b5059ffb78113b99f190cc6b29.tar.gz nixlib-5f19542581ed03b5059ffb78113b99f190cc6b29.tar.bz2 nixlib-5f19542581ed03b5059ffb78113b99f190cc6b29.tar.lz nixlib-5f19542581ed03b5059ffb78113b99f190cc6b29.tar.xz nixlib-5f19542581ed03b5059ffb78113b99f190cc6b29.tar.zst nixlib-5f19542581ed03b5059ffb78113b99f190cc6b29.zip | |
Merge commit 'refs/pull/14694/head' of git://github.com/NixOS/nixpkgs into staging
Diffstat (limited to 'nixos/modules/services')
| -rw-r--r-- | nixos/modules/services/misc/octoprint.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/web-servers/apache-httpd/trac.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/enlightenment.nix | 2 |
3 files changed, 3 insertions, 3 deletions
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}" 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 |