diff options
| author | Michele Guerini Rocco <rnhmjoj@users.noreply.github.com> | 2021-05-30 10:22:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-30 10:22:35 +0200 |
| commit | bfdf04bd21bb99b05bb10f0de8876ad4baca48e4 (patch) | |
| tree | ae2b820e54f6fd74fdd91254fd240d6bb3c2dfd9 | |
| parent | Merge pull request #124943 from fortuneteller2k/vieb (diff) | |
| parent | vapoursynth: improve plugin dependency resolution (diff) | |
| download | nixpkgs-bfdf04bd21bb99b05bb10f0de8876ad4baca48e4.tar.gz | |
Merge pull request #123253 from sbruder/vapoursynth-improve-dependency-resolution
vapoursynth: improve plugin dependency resolution
| -rw-r--r-- | pkgs/development/libraries/vapoursynth/plugin-interface.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/libraries/vapoursynth/plugin-interface.nix b/pkgs/development/libraries/vapoursynth/plugin-interface.nix index 55b2b03c893e..95df3c97747f 100644 --- a/pkgs/development/libraries/vapoursynth/plugin-interface.nix +++ b/pkgs/development/libraries/vapoursynth/plugin-interface.nix @@ -8,10 +8,11 @@ plugins: let getRecursivePropagatedBuildInputs = pkgs: lib.flatten (map - (pkg: pkg.propagatedBuildInputs ++ (getRecursivePropagatedBuildInputs pkg.propagatedBuildInputs)) + (pkg: let cleanPropagatedBuildInputs = lib.filter lib.isDerivation pkg.propagatedBuildInputs; + in cleanPropagatedBuildInputs ++ (getRecursivePropagatedBuildInputs cleanPropagatedBuildInputs)) pkgs); - deepPlugins = plugins ++ (getRecursivePropagatedBuildInputs plugins); + deepPlugins = lib.unique (plugins ++ (getRecursivePropagatedBuildInputs plugins)); pluginsEnv = buildEnv { name = "vapoursynth-plugins-env"; |