Merge pull request #40553 from Anton-Latukha/handbrake-platforms-cmake
handbrake: platforms: linux -> unix; rm cmake dep
This commit is contained in:
commit
b54f76e862
|
@ -3,11 +3,9 @@
|
||||||
# Derivation patches HandBrake to use our closure.
|
# Derivation patches HandBrake to use our closure.
|
||||||
#
|
#
|
||||||
|
|
||||||
# TODO: Release 1.2.0 would switch LibAV to FFmpeg.
|
|
||||||
|
|
||||||
{ stdenv, lib, fetchurl,
|
{ stdenv, lib, fetchurl,
|
||||||
python2, pkgconfig, yasm, harfbuzz, zlib,
|
python2, pkgconfig, yasm, harfbuzz, zlib,
|
||||||
autoconf, automake, cmake, libtool, m4, jansson,
|
autoconf, automake, libtool, m4, jansson,
|
||||||
libass, libiconv, libsamplerate, fribidi, libxml2, bzip2,
|
libass, libiconv, libsamplerate, fribidi, libxml2, bzip2,
|
||||||
libogg, libopus, libtheora, libvorbis, libdvdcss, a52dec,
|
libogg, libopus, libtheora, libvorbis, libdvdcss, a52dec,
|
||||||
lame, libdvdread, libdvdnav, libbluray,
|
lame, libdvdread, libdvdnav, libbluray,
|
||||||
|
@ -21,6 +19,7 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
# TODO: Release 1.2.0 would switch LibAV to FFmpeg.
|
||||||
version = "1.1.0";
|
version = "1.1.0";
|
||||||
name = "handbrake-${version}";
|
name = "handbrake-${version}";
|
||||||
|
|
||||||
|
@ -40,7 +39,7 @@ stdenv.mkDerivation rec {
|
||||||
});
|
});
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
cmake python2 pkgconfig yasm autoconf automake libtool m4
|
python2 pkgconfig yasm autoconf automake libtool m4
|
||||||
] ++ lib.optionals useGtk [ intltool wrapGAppsHook ];
|
] ++ lib.optionals useGtk [ intltool wrapGAppsHook ];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
@ -55,8 +54,6 @@ stdenv.mkDerivation rec {
|
||||||
] ++ (if useFfmpeg then [ ffmpeg ] else [ patched_libav_12 ])
|
] ++ (if useFfmpeg then [ ffmpeg ] else [ patched_libav_12 ])
|
||||||
++ lib.optional useFdk fdk_aac;
|
++ lib.optional useFdk fdk_aac;
|
||||||
|
|
||||||
dontUseCmakeConfigure = true;
|
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
|
@ -103,6 +100,6 @@ stdenv.mkDerivation rec {
|
||||||
'';
|
'';
|
||||||
license = licenses.gpl2;
|
license = licenses.gpl2;
|
||||||
maintainers = with maintainers; [ Anton-Latukha wmertens ];
|
maintainers = with maintainers; [ Anton-Latukha wmertens ];
|
||||||
platforms = platforms.linux;
|
platforms = with platforms; unix;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue