Merge pull request #273262 from dali99/synapse-buildenv

matrix-synapse: build a pythonEnv out of extraPackages to include dependencies
This commit is contained in:
Maximilian Bosch 2023-12-14 13:48:15 +01:00 committed by GitHub
commit cec423f9f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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;