diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-07-02 15:16:30 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-07-02 15:16:42 +0300 |
| commit | b3e27962aa6b216baf755142ddc7f2f2d45c296d (patch) | |
| tree | 1221aae6cacc8c96f68fe0f1115e92288f5709d1 | |
| parent | 24b3fa1ae6e140f10b14f357d54d525ad35cfda1 (diff) | |
| download | nixlib-b3e27962aa6b216baf755142ddc7f2f2d45c296d.tar nixlib-b3e27962aa6b216baf755142ddc7f2f2d45c296d.tar.gz nixlib-b3e27962aa6b216baf755142ddc7f2f2d45c296d.tar.bz2 nixlib-b3e27962aa6b216baf755142ddc7f2f2d45c296d.tar.lz nixlib-b3e27962aa6b216baf755142ddc7f2f2d45c296d.tar.xz nixlib-b3e27962aa6b216baf755142ddc7f2f2d45c296d.tar.zst nixlib-b3e27962aa6b216baf755142ddc7f2f2d45c296d.zip | |
bomi: fix compilation, move to new Qt
| -rw-r--r-- | pkgs/applications/video/bomi/default.nix | 30 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 26 insertions, 7 deletions
diff --git a/pkgs/applications/video/bomi/default.nix b/pkgs/applications/video/bomi/default.nix index c017ed4cda32..841fe299430a 100644 --- a/pkgs/applications/video/bomi/default.nix +++ b/pkgs/applications/video/bomi/default.nix @@ -1,8 +1,9 @@ -{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, perl, python, which, makeQtWrapper +{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, perl, python, which, makeQtWrapper , libX11, libxcb, mesa , qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmakeHook -, ffmpeg , libchardet +, ffmpeg + , mpg123 , libass , libdvdread @@ -38,11 +39,30 @@ stdenv.mkDerivation rec { sha256 = "0a7n46gn3n5098lxxvl3s29s8jlkzss6by9074jx94ncn9cayf2h"; }; + patches = [ + (fetchpatch rec { + name = "bomi-compilation-fix.patch"; + url = "https://svnweb.mageia.org/packages/cauldron/bomi/current/SOURCES/${name}?revision=995725&view=co&pathrev=995725"; + sha256 = "1dwryya5ljx35dbx6ag9d3rjjazni2mfn3vwirjdijdy6yz22jm6"; + }) + (fetchpatch rec { + name = "bomi-fix-expected-unqualified-id-before-numeric-constant-unix.patch"; + url = "https://svnweb.mageia.org/packages/cauldron/bomi/current/SOURCES/${name}?revision=995725&view=co&pathrev=995725"; + sha256 = "0n3xsrdrggimzw30gxlnrr088ndbdjqlqr46dzmfv8zan79lv5ri"; + }) + ]; + buildInputs = with stdenv.lib; - [ libX11 libxcb mesa - qtbase qtx11extras + [ libX11 + libxcb + mesa + qtbase + qtx11extras + qtdeclarative + qtquickcontrols ffmpeg libchardet + mpg123 libass libdvdread @@ -53,8 +73,6 @@ stdenv.mkDerivation rec { libvdpau libva libbluray - qtdeclarative - qtquickcontrols ] ++ optional jackSupport jack ++ optional portaudioSupport portaudio diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b22257c6492..e92927e9efee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12131,9 +12131,10 @@ in bluejeans = callPackage ../applications/networking/browsers/mozilla-plugins/bluejeans { }; - bomi = qt55.callPackage ../applications/video/bomi { + bomi = qt5.callPackage ../applications/video/bomi { youtube-dl = pythonPackages.youtube-dl; pulseSupport = config.pulseaudio or true; + ffmpeg = ffmpeg_2; }; brackets = callPackage ../applications/editors/brackets { gconf = gnome3.gconf; }; |