diff options
author | Daniel Olsen <daniel.olsen99@gmail.com> | 2023-12-10 03:21:27 +0100 |
---|---|---|
committer | Daniel Olsen <daniel.olsen99@gmail.com> | 2023-12-13 19:48:06 +0100 |
commit | a695ad5fb5eca79e5844c1de0a4c9f5589fcf38c (patch) | |
tree | 9a8191c4acfb6316d4bd2f5d88f026e1a90ddfb6 /pkgs/servers/matrix-synapse | |
parent | b4b49b84c9814873459e99eb76a821018188153e (diff) | |
download | nixlib-a695ad5fb5eca79e5844c1de0a4c9f5589fcf38c.tar nixlib-a695ad5fb5eca79e5844c1de0a4c9f5589fcf38c.tar.gz nixlib-a695ad5fb5eca79e5844c1de0a4c9f5589fcf38c.tar.bz2 nixlib-a695ad5fb5eca79e5844c1de0a4c9f5589fcf38c.tar.lz nixlib-a695ad5fb5eca79e5844c1de0a4c9f5589fcf38c.tar.xz nixlib-a695ad5fb5eca79e5844c1de0a4c9f5589fcf38c.tar.zst nixlib-a695ad5fb5eca79e5844c1de0a4c9f5589fcf38c.zip |
matrix-synapse: build a pythonEnv out of extraPackages to include dependencies
By just appending site-packages to the extraPackages, you would get situations like pysaml2 being included in pythonpath, but not its dependencies like pytz and dateutils
Diffstat (limited to 'pkgs/servers/matrix-synapse')
-rw-r--r-- | pkgs/servers/matrix-synapse/wrapper.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/servers/matrix-synapse/wrapper.nix b/pkgs/servers/matrix-synapse/wrapper.nix index 930142c5f55e..5b7ce47b367c 100644 --- a/pkgs/servers/matrix-synapse/wrapper.nix +++ b/pkgs/servers/matrix-synapse/wrapper.nix @@ -14,11 +14,11 @@ let extraPackages = lib.concatMap (extra: matrix-synapse-unwrapped.optional-dependencies.${extra}) (lib.unique extras); - pluginsEnv = matrix-synapse-unwrapped.python.buildEnv.override { - extraLibs = plugins; + pythonEnv = matrix-synapse-unwrapped.python.buildEnv.override { + extraLibs = extraPackages ++ plugins; }; - searchPath = lib.makeSearchPathOutput "lib" matrix-synapse-unwrapped.python.sitePackages (extraPackages ++ [ pluginsEnv ]); + searchPath = "${pythonEnv}/${matrix-synapse-unwrapped.python.sitePackages}"; in stdenv.mkDerivation { name = (lib.appendToName "wrapped" matrix-synapse-unwrapped).name; |