diff options
| author | Peter Hoeg <peter@speartail.com> | 2017-03-31 14:19:34 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-31 14:19:34 +0800 |
| commit | 7b739364596aec89adedbb156243a5690917fbba (patch) | |
| tree | 65cb0c55c4ccf0a41aa7dbe8f43461afa4b1b244 /pkgs/top-level | |
| parent | caade79100ca9df22f7f5592811b05b34bef5cd6 (diff) | |
| parent | fdd654a7a9fafccf1b920b4395b36c5318347dcd (diff) | |
| download | nixlib-7b739364596aec89adedbb156243a5690917fbba.tar nixlib-7b739364596aec89adedbb156243a5690917fbba.tar.gz nixlib-7b739364596aec89adedbb156243a5690917fbba.tar.bz2 nixlib-7b739364596aec89adedbb156243a5690917fbba.tar.lz nixlib-7b739364596aec89adedbb156243a5690917fbba.tar.xz nixlib-7b739364596aec89adedbb156243a5690917fbba.tar.zst nixlib-7b739364596aec89adedbb156243a5690917fbba.zip | |
Merge pull request #22710 from AndersonTorres/openshot
openshot-qt: 2.1.0 -> 2.2.0
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0ef39ce64f6..42de4fd80e1d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5323,7 +5323,7 @@ with pkgs; jdk = jdk8; jre = jre8; jre_headless = jre8_headless; - + openshot-qt = libsForQt56.callPackage ../applications/video/openshot-qt { }; oraclejdk = pkgs.jdkdistro true false; @@ -9511,7 +9511,9 @@ with pkgs; libktorrent = callPackage ../development/libraries/libktorrent { }; - libopenshot = callPackage ../applications/video/openshot-qt/libopenshot.nix {}; + libopenshot = callPackage ../applications/video/openshot-qt/libopenshot.nix { }; + + libopenshot-audio = callPackage ../applications/video/openshot-qt/libopenshot-audio.nix { }; mlt = callPackage ../development/libraries/mlt/qt-5.nix { ffmpeg = ffmpeg_2; |