dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #40553 from Anton-Latukha/handbrake-platforms-cmake

Browse Source 
handbrake: platforms: linux -> unix; rm cmake dep
This commit is contained in:
Matthew Justin Bauer 2018-05-15 14:27:07 -05:00 committed by GitHub
commit b54f76e862
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/video/handbrake/default.nix
View File

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