diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-06-26 00:09:11 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-26 00:09:11 +0000 |
| commit | 947012b992faa88e9d5b0d168c8f81c8e7cf995e (patch) | |
| tree | 3b5f923312bb65436d1ffe6134af9ba8c9e9f0f2 /pkgs/applications/video/olive-editor/default.nix | |
| parent | 4966eff42cf9976319ac34fa28f3af224723a771 (diff) | |
| parent | f15360e6a41e77aa479dd47896e709fd77214e4f (diff) | |
| download | nixpkgs-947012b992faa88e9d5b0d168c8f81c8e7cf995e.tar nixpkgs-947012b992faa88e9d5b0d168c8f81c8e7cf995e.tar.gz nixpkgs-947012b992faa88e9d5b0d168c8f81c8e7cf995e.tar.bz2 nixpkgs-947012b992faa88e9d5b0d168c8f81c8e7cf995e.tar.lz nixpkgs-947012b992faa88e9d5b0d168c8f81c8e7cf995e.tar.xz nixpkgs-947012b992faa88e9d5b0d168c8f81c8e7cf995e.tar.zst nixpkgs-947012b992faa88e9d5b0d168c8f81c8e7cf995e.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/video/olive-editor/default.nix')
| -rw-r--r-- | pkgs/applications/video/olive-editor/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/video/olive-editor/default.nix b/pkgs/applications/video/olive-editor/default.nix index 7bacf4138c1..c63011eebc0 100644 --- a/pkgs/applications/video/olive-editor/default.nix +++ b/pkgs/applications/video/olive-editor/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, which, qmake, mkDerivation, - qtmultimedia, wrapQtAppsHook, frei0r, opencolorio, ffmpeg-full, + qtmultimedia, wrapQtAppsHook, frei0r, opencolorio_1, ffmpeg-full, CoreFoundation }: mkDerivation rec { @@ -23,7 +23,7 @@ mkDerivation rec { buildInputs = [ ffmpeg-full frei0r - opencolorio + opencolorio_1 qtmultimedia ] ++ lib.optional stdenv.isDarwin CoreFoundation; |