diff options
| author | Anthony Cowley <acowley@gmail.com> | 2019-12-20 22:01:52 -0500 |
|---|---|---|
| committer | Anthony Cowley <acowley@gmail.com> | 2019-12-20 22:08:29 -0500 |
| commit | 7978601e8dfe9401b33ef641bca83805d4c34fdf (patch) | |
| tree | df5f5f5d3e7569d9a1df11121286194e81b0cc10 /pkgs/applications/video/handbrake/default.nix | |
| parent | b4dea13eb4652febdbda84692adfc670dd52bc5c (diff) | |
| download | nixpkgs-7978601e8dfe9401b33ef641bca83805d4c34fdf.tar nixpkgs-7978601e8dfe9401b33ef641bca83805d4c34fdf.tar.gz nixpkgs-7978601e8dfe9401b33ef641bca83805d4c34fdf.tar.bz2 nixpkgs-7978601e8dfe9401b33ef641bca83805d4c34fdf.tar.lz nixpkgs-7978601e8dfe9401b33ef641bca83805d4c34fdf.tar.xz nixpkgs-7978601e8dfe9401b33ef641bca83805d4c34fdf.tar.zst nixpkgs-7978601e8dfe9401b33ef641bca83805d4c34fdf.zip | |
handbrake: remove nasm and cmake dependencies
These were included by the handbrake build because they are used by external dependencies. In nixpkgs, we build those dependencies (e.g. codecs) separately, and so excise the check for these tools from the handbrake build.
Diffstat (limited to 'pkgs/applications/video/handbrake/default.nix')
| -rw-r--r-- | pkgs/applications/video/handbrake/default.nix | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 09f8d9f9170..4341055d084 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -9,7 +9,7 @@ { stdenv, lib, fetchurl, fetchpatch, # Main build tools - python2, pkgconfig, autoconf, automake, cmake, nasm, libtool, m4, lzma, + python2, pkgconfig, autoconf, automake, libtool, m4, lzma, numactl, # Processing, video codecs, containers ffmpeg-full, nv-codec-headers, libogg, x264, x265, libvpx, libtheora, dav1d, @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - python2 pkgconfig autoconf automake cmake nasm libtool m4 + python2 pkgconfig autoconf automake libtool m4 ] ++ lib.optionals useGtk [ intltool wrapGAppsHook ]; buildInputs = [ @@ -75,13 +75,6 @@ stdenv.mkDerivation rec { # look at ./make/configure.py search "enable_nvenc" ++ lib.optional stdenv.isLinux nv-codec-headers; - # NOTE: 2018-12-25: v1.2.0 now requires cmake dep - # (default distribution bundles&builds 3rd party libs), - # don't trigger cmake build - dontUseCmakeConfigure = true; - # cp: cannot create regular file './internal_defaults.json': File exists - enableParallelBuilding = false; - preConfigure = '' patchShebangs scripts @@ -93,7 +86,9 @@ stdenv.mkDerivation rec { # Force using nixpkgs dependencies sed -i '/MODULES += contrib/d' make/include/main.defs sed -i '/PKG_CONFIG_PATH=/d' gtk/module.rules - sed -i 's/^[[:space:]]*\(meson\|ninja\)[[:space:]]*= ToolProbe.*$//g' make/configure.py + sed -e 's/^[[:space:]]*\(meson\|ninja\|nasm\)[[:space:]]*= ToolProbe.*$//g' \ + -e '/ ## Additional library and tool checks/,/ ## MinGW specific library and tool checks/d' \ + -i make/configure.py ''; configureFlags = [ |