public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #124946 from NixOS/backport-123253-to-release-21.05

Browse Source 
[Backport release-21.05] vapoursynth: improve plugin dependency resolution
This commit is contained in:
Michele Guerini Rocco 2021-05-30 11:31:35 +02:00 committed by GitHub
commit c399b0f178
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/vapoursynth/plugin-interface.nix
View File

@ -8,10 +8,11 @@ plugins: let
getRecursivePropagatedBuildInputs = pkgs: lib.flatten getRecursivePropagatedBuildInputs = pkgs: lib.flatten
(map (map
(pkg: pkg.propagatedBuildInputs ++ (getRecursivePropagatedBuildInputs pkg.propagatedBuildInputs)) (pkg: let cleanPropagatedBuildInputs = lib.filter lib.isDerivation pkg.propagatedBuildInputs;
in cleanPropagatedBuildInputs ++ (getRecursivePropagatedBuildInputs cleanPropagatedBuildInputs))
pkgs); pkgs);
deepPlugins = plugins ++ (getRecursivePropagatedBuildInputs plugins); deepPlugins = lib.unique (plugins ++ (getRecursivePropagatedBuildInputs plugins));
pluginsEnv = buildEnv { pluginsEnv = buildEnv {
name = "vapoursynth-plugins-env"; name = "vapoursynth-plugins-env";