pyrox.dev / nixpkgs
lol
fork atom

bomi: fix compilation, move to new Qt

Nikolay Amiantov b3e27962 24b3fa1a

+26 -7
unified split
+24 -6
pkgs/applications/video/bomi/default.nix
··· 1 - { stdenv, fetchurl, fetchFromGitHub, pkgconfig, perl, python, which, makeQtWrapper 1 + { stdenv, fetchFromGitHub, fetchpatch, pkgconfig, perl, python, which, makeQtWrapper 2 2 , libX11, libxcb, mesa 3 3 , qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmakeHook 4 + , libchardet 4 5 , ffmpeg 5 - , libchardet 6 + 6 7 , mpg123 7 8 , libass 8 9 , libdvdread ··· 38 39 sha256 = "0a7n46gn3n5098lxxvl3s29s8jlkzss6by9074jx94ncn9cayf2h"; 39 40 }; 40 41 42 + patches = [ 43 + (fetchpatch rec { 44 + name = "bomi-compilation-fix.patch"; 45 + url = "https://svnweb.mageia.org/packages/cauldron/bomi/current/SOURCES/${name}?revision=995725&view=co&pathrev=995725"; 46 + sha256 = "1dwryya5ljx35dbx6ag9d3rjjazni2mfn3vwirjdijdy6yz22jm6"; 47 + }) 48 + (fetchpatch rec { 49 + name = "bomi-fix-expected-unqualified-id-before-numeric-constant-unix.patch"; 50 + url = "https://svnweb.mageia.org/packages/cauldron/bomi/current/SOURCES/${name}?revision=995725&view=co&pathrev=995725"; 51 + sha256 = "0n3xsrdrggimzw30gxlnrr088ndbdjqlqr46dzmfv8zan79lv5ri"; 52 + }) 53 + ]; 54 + 41 55 buildInputs = with stdenv.lib; 42 - [ libX11 libxcb mesa 43 - qtbase qtx11extras 56 + [ libX11 57 + libxcb 58 + mesa 59 + qtbase 60 + qtx11extras 61 + qtdeclarative 62 + qtquickcontrols 44 63 ffmpeg 45 64 libchardet 65 + 46 66 mpg123 47 67 libass 48 68 libdvdread ··· 53 73 libvdpau 54 74 libva 55 75 libbluray 56 - qtdeclarative 57 - qtquickcontrols 58 76 ] 59 77 ++ optional jackSupport jack 60 78 ++ optional portaudioSupport portaudio
+2 -1
pkgs/top-level/all-packages.nix
··· 12131 12131 12132 12132 bluejeans = callPackage ../applications/networking/browsers/mozilla-plugins/bluejeans { }; 12133 12133 12134 - bomi = qt55.callPackage ../applications/video/bomi { 12134 + bomi = qt5.callPackage ../applications/video/bomi { 12135 12135 youtube-dl = pythonPackages.youtube-dl; 12136 12136 pulseSupport = config.pulseaudio or true; 12137 + ffmpeg = ffmpeg_2; 12137 12138 }; 12138 12139 12139 12140 brackets = callPackage ../applications/editors/brackets { gconf = gnome3.gconf; };