MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mkvtoolnix: 8.4.0 -> 8.9.0

Browse source
This commit is contained in:
rnhmjoj 2016-03-07 19:24:24 +01:00
parent 0ee75214f3
commit aaa443516f
2 changed files with 36 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

94
pkgs/applications/video/mkvtoolnix/default.nix
View file

@ -1,76 +1,54 @@
{ stdenv, fetchurl, gettext, pkgconfig, ruby { stdenv, fetchgit, pkgconfig, autoconf, automake
, boost, expat, file, flac, libebml, libmatroska, libogg, libvorbis, xdg_utils, zlib , ruby, file, xdg_utils, gettext, expat, qt5, boost
# pugixml (not packaged) , libebml, zlib, libmatroska, libogg, libvorbis, flac
, buildConfig ? "all" , withGUI ? true
, withGUI ? false, qt5 ? null # Disabled for now until upstream issues are resolved
, legacyGUI ? true, wxGTK ? null
# For now both qt5 and wxwidgets gui's are enabled, if wxwidgets is disabled the
# build system doesn't install desktop entries, icons, etc...
, libiconv
}: }:
let
inherit (stdenv.lib) enableFeature optional;
in
assert withGUI -> qt5 != null; assert withGUI -> qt5 != null;
assert legacyGUI -> wxGTK != null;
with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mkvtoolnix-${version}"; name = "mkvtoolnix-${version}";
version = "8.4.0"; version = "8.9.0";
src = fetchurl { src = fetchgit {
url = "http://www.bunkus.org/videotools/mkvtoolnix/sources/${name}.tar.xz"; url = "https://github.com/mbunkus/mkvtoolnix.git";
sha256 = "0y7qm8q9vpvjiw7b69k9140pw9nhvs6ggmk56yxnmcd02inm19gn"; rev = "54e6b52b3dde07f89da4542997ef059e18802128";
sha256 = "1hm9f9q60c0axmmlsalazsiil8gk3v8q6cl5qxsfa95m51i39878";
}; };
patchPhase = '' nativeBuildInputs = [ gettext ruby ];
patchShebangs ./rake.d/
patchShebangs ./Rakefile
# Force ruby encoding to use UTF-8 or else when enabling qt5 the Rakefile may
# fail with `invalid byte sequence in US-ASCII' due to UTF-8 characters
# This workaround replaces an arbitrary comment in the drake file
sed -e 's,#--,Encoding.default_external = Encoding::UTF_8,' -i ./drake
'';
configureFlags = [
"--with-boost-libdir=${boost.lib}/lib"
"--without-curl"
] ++ (
if (withGUI || legacyGUI) then [
"--with-mkvtoolnix-gui"
"--enable-gui"
(enableFeature withGUI "qt")
(enableFeature legacyGUI "wxwidgets")
] else [
"--disable-gui"
]
);
nativeBuildInputs = [ gettext pkgconfig ruby ];
buildInputs = [ buildInputs = [
boost expat file flac libebml libmatroska libogg libvorbis xdg_utils zlib pkgconfig autoconf automake expat
] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ] file xdg_utils boost libebml zlib
++ optional withGUI qt5 libmatroska libogg libvorbis flac
++ optional legacyGUI wxGTK; (optional withGUI qt5.qtbase)
];
enableParallelBuilding = true; preConfigure = "./autogen.sh";
buildPhase = "./drake -j $NIX_BUILD_CORES";
installPhase = "./drake install -j $NIX_BUILD_CORES";
buildPhase = '' configureFlags = [
./drake "--enable-magic"
''; "--enable-optimization"
"--with-boost-libdir=${boost.lib}/lib"
installPhase = '' "--disable-debug"
./drake install "--disable-profiling"
''; "--disable-precompiled-headers"
"--disable-static-qt"
"--without-curl"
"--with-gettext"
(enableFeature withGUI "qt")
];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Cross-platform tools for Matroska"; description = "Cross-platform tools for Matroska";
homepage = http://www.bunkus.org/videotools/mkvtoolnix/; homepage = http://www.bunkus.org/videotools/mkvtoolnix/;
license = licenses.gpl2; license = licenses.gpl2;
maintainers = with maintainers; [ codyopel fuuzetsu ]; maintainers = with maintainers; [ codyopel fuuzetsu rnhmjoj ];
platforms = platforms.all; platforms = platforms.linux;
}; };
} }

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

@ -8148,9 +8148,6 @@ let
mkvtoolnix-cli = mkvtoolnix.override { mkvtoolnix-cli = mkvtoolnix.override {
withGUI = false; withGUI = false;
qt5 = null;
legacyGUI = false;
wxGTK = null;
}; };
mlt-qt4 = callPackage ../development/libraries/mlt { mlt-qt4 = callPackage ../development/libraries/mlt {