diff options
author | Maximilian Bosch <maximilian@mbosch.me> | 2023-12-14 13:48:15 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-14 13:48:15 +0100 |
commit | cec423f9f9a99cec5bf615af9d44607762975f6d (patch) | |
tree | 9668519bc2213aa3011400cf56308f24cd5816a2 /pkgs/servers/matrix-synapse | |
parent | a89ba043dda559ebc57fc6f1fa8cf3a0b207f688 (diff) | |
parent | a695ad5fb5eca79e5844c1de0a4c9f5589fcf38c (diff) |
Merge pull request #273262 from dali99/synapse-buildenv
matrix-synapse: build a pythonEnv out of extraPackages to include dependencies
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 930142c5f55e2..5b7ce47b367c6 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; |