diff options
| author | Domen Kožar <domen@dev.si> | 2016-02-28 06:20:29 +0000 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2016-02-28 06:20:29 +0000 |
| commit | 88df0358180892c1b36822264394ec4bd66b17a4 (patch) | |
| tree | 5e794eadf2e97fc64a4c78bdc1d0a29f4aa93d71 | |
| parent | bc4dbca2b3dcfb95629319447173183dadd2a1c2 (diff) | |
| parent | 3f7c6006664bb203d8dffe74ccb97c5ab35b749c (diff) | |
| download | nixlib-88df0358180892c1b36822264394ec4bd66b17a4.tar nixlib-88df0358180892c1b36822264394ec4bd66b17a4.tar.gz nixlib-88df0358180892c1b36822264394ec4bd66b17a4.tar.bz2 nixlib-88df0358180892c1b36822264394ec4bd66b17a4.tar.lz nixlib-88df0358180892c1b36822264394ec4bd66b17a4.tar.xz nixlib-88df0358180892c1b36822264394ec4bd66b17a4.tar.zst nixlib-88df0358180892c1b36822264394ec4bd66b17a4.zip | |
Merge pull request #13524 from makefu/bepasty-recursive-env
services.bepasty: buildEnv for creating PYTHONPATH
| -rw-r--r-- | nixos/modules/services/misc/bepasty.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/nixos/modules/services/misc/bepasty.nix b/nixos/modules/services/misc/bepasty.nix index 12671cb1b6cd..5bda73ab64f0 100644 --- a/nixos/modules/services/misc/bepasty.nix +++ b/nixos/modules/services/misc/bepasty.nix @@ -103,9 +103,13 @@ in after = [ "network.target" ]; restartIfChanged = true; - environment = { + environment = let + penv = python.buildEnv.override { + extraLibs = [ bepasty gevent ]; + }; + in { BEPASTY_CONFIG = "${server.workDir}/bepasty-${name}.conf"; - PYTHONPATH= "${bepasty}/lib/${python.libPrefix}/site-packages:${gevent}/lib/${python.libPrefix}/site-packages"; + PYTHONPATH= "${penv}/${python.sitePackages}/"; }; serviceConfig = { |