public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bomi: fix compilation, move to new Qt

Browse Source
This commit is contained in:
Nikolay Amiantov 2016-07-02 15:16:30 +03:00
parent 24b3fa1ae6
commit b3e27962aa
2 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkgs/applications/video/bomi/default.nix
View File

@ -1,8 +1,9 @@
{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, perl, python, which, makeQtWrapper { stdenv, fetchFromGitHub, fetchpatch, pkgconfig, perl, python, which, makeQtWrapper
, libX11, libxcb, mesa , libX11, libxcb, mesa
, qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmakeHook , qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmakeHook
, ffmpeg
, libchardet , libchardet
, ffmpeg
, mpg123 , mpg123
, libass , libass
, libdvdread , libdvdread
@ -38,11 +39,30 @@ stdenv.mkDerivation rec {
sha256 = "0a7n46gn3n5098lxxvl3s29s8jlkzss6by9074jx94ncn9cayf2h"; 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; buildInputs = with stdenv.lib;
[ libX11 libxcb mesa [ libX11
qtbase qtx11extras libxcb
mesa
qtbase
qtx11extras
qtdeclarative
qtquickcontrols
ffmpeg ffmpeg
libchardet libchardet
mpg123 mpg123
libass libass
libdvdread libdvdread
@ -53,8 +73,6 @@ stdenv.mkDerivation rec {
libvdpau libvdpau
libva libva
libbluray libbluray
qtdeclarative
qtquickcontrols
] ]
++ optional jackSupport jack ++ optional jackSupport jack
++ optional portaudioSupport portaudio ++ optional portaudioSupport portaudio

3
pkgs/top-level/all-packages.nix
View File

@ -12131,9 +12131,10 @@ in
bluejeans = callPackage ../applications/networking/browsers/mozilla-plugins/bluejeans { }; 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; youtube-dl = pythonPackages.youtube-dl;
pulseSupport = config.pulseaudio or true; pulseSupport = config.pulseaudio or true;
ffmpeg = ffmpeg_2;
}; };
brackets = callPackage ../applications/editors/brackets { gconf = gnome3.gconf; }; brackets = callPackage ../applications/editors/brackets { gconf = gnome3.gconf; };