diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-05-27 21:07:59 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-05-27 21:07:59 +0200 |
| commit | 48458b1c9654509f5bd889f9ec8b395d506140e5 (patch) | |
| tree | 30cb3c4a0362e6903fb249d7d9ba1d84293ce113 /pkgs/applications/video/handbrake | |
| parent | d93b1f80c034290cc49836030f4f803af70a8f69 (diff) | |
| download | nixpkgs-48458b1c9654509f5bd889f9ec8b395d506140e5.tar nixpkgs-48458b1c9654509f5bd889f9ec8b395d506140e5.tar.gz nixpkgs-48458b1c9654509f5bd889f9ec8b395d506140e5.tar.bz2 nixpkgs-48458b1c9654509f5bd889f9ec8b395d506140e5.tar.lz nixpkgs-48458b1c9654509f5bd889f9ec8b395d506140e5.tar.xz nixpkgs-48458b1c9654509f5bd889f9ec8b395d506140e5.tar.zst nixpkgs-48458b1c9654509f5bd889f9ec8b395d506140e5.zip | |
handbrake: disable unfree faac, as it doesn't build with it
Diffstat (limited to 'pkgs/applications/video/handbrake')
| -rw-r--r-- | pkgs/applications/video/handbrake/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 34aa8ff65de..297da6738ee 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -31,7 +31,8 @@ stdenv.mkDerivation rec { version = "0.9.9"; name = "handbrake-${version}"; - allowUnfree = config.allowUnfree or false; + # ToDo: doesn't work (yet) + allowUnfree = false; # config.allowUnfree or false; buildInputsX = stdenv.lib.optionals useGtk [ glib gtk intltool libnotify @@ -39,7 +40,7 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optionals useWebKitGtk [ webkitgtk ]; # Did not test compiling with it - unfreeInputs = stdenv.lib.optionals allowUnfree [ faac ]; + unfreeInputs = stdenv.lib.optional allowUnfree faac; nativeBuildInputs = [ python pkgconfig yasm autoconf automake libtool m4 ]; buildInputs = [ @@ -49,14 +50,14 @@ stdenv.mkDerivation rec { lame ffmpeg libdvdread libdvdnav libbluray mp4v2 mpeg2dec x264 ] ++ buildInputsX ++ unfreeInputs; - + src = fetchurl { name = "HandBrake-${version}.tar.bz2"; url = "http://handbrake.fr/rotation.php?file=HandBrake-${version}.tar.bz2"; sha256 = "1crmm1c32vx60jfl2bqzg59q4qqx6m83b08snp7h1njc21sdf7d7"; }; - patches = stdenv.lib.optionals (! allowUnfree) [ ./disable-unfree.patch ]; + patches = stdenv.lib.optional (! allowUnfree) ./disable-unfree.patch; preConfigure = '' # Fake wget to prevent downloads |