Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4046c49fb595
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b54f76e86286
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on May 15, 2018

  1. handbrake: rm dependency on cmake

    @Anton-Latukha
    Anton-Latukha committed May 15, 2018
    Copy the full SHA
    56149c2 View commit details

  2. handbrake: platforms: linux -> unix

    @Anton-Latukha
    Anton-Latukha committed May 15, 2018
    Copy the full SHA
    1eea58e View commit details

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

    handbrake: platforms: linux -> unix; rm cmake dep
    @matthewbauer
    matthewbauer authored May 15, 2018
    Copy the full SHA
    b54f76e View commit details
Showing with 4 additions and 7 deletions.
  1. +4 −7 pkgs/applications/video/handbrake/default.nix
11 changes: 4 additions & 7 deletions pkgs/applications/video/handbrake/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
};
}