summary refs log tree commit diff
path: root/pkgs/development/libraries/vapoursynth
diff options
context:
space:
mode:
authorGabriel Ebner <gebner@gebner.org>2018-07-03 17:12:27 +0200
committerGabriel Ebner <gebner@gebner.org>2018-07-03 17:14:11 +0200
commit2f3cf5830971b64a38c2b0bd7068026da92477f4 (patch)
tree0778b77ca5d1ced04262b809475233bb0572af86 /pkgs/development/libraries/vapoursynth
parentebf4cfb272476e18b5036b7f4a5a307bc1ed7f63 (diff)
downloadnixpkgs-2f3cf5830971b64a38c2b0bd7068026da92477f4.tar
nixpkgs-2f3cf5830971b64a38c2b0bd7068026da92477f4.tar.gz
nixpkgs-2f3cf5830971b64a38c2b0bd7068026da92477f4.tar.bz2
nixpkgs-2f3cf5830971b64a38c2b0bd7068026da92477f4.tar.lz
nixpkgs-2f3cf5830971b64a38c2b0bd7068026da92477f4.tar.xz
nixpkgs-2f3cf5830971b64a38c2b0bd7068026da92477f4.tar.zst
nixpkgs-2f3cf5830971b64a38c2b0bd7068026da92477f4.zip
Revert "vapoursynth: fix build"
This reverts commit ad611a622374b3a2202684eda61e3f3207e5d3e1.
A better fix was committed directly afterwards in 2afe06c18ffabf9a66c928d947549dcb54fff450
Diffstat (limited to 'pkgs/development/libraries/vapoursynth')
-rw-r--r--pkgs/development/libraries/vapoursynth/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix
index 74f8598c314..7344f3a7e2b 100644
--- a/pkgs/development/libraries/vapoursynth/default.nix
+++ b/pkgs/development/libraries/vapoursynth/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook
 , zimg, libass, python3, libiconv
-, ApplicationServices, nasm, x265
+, ApplicationServices, nasm
 , ocrSupport ?  false, tesseract ? null
 , imwriSupport? true,  imagemagick7 ? null
 }:
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     (python3.withPackages (ps: with ps; [ sphinx cython ]))
   ] ++ optionals stdenv.isDarwin [ libiconv ApplicationServices ]
     ++ optional ocrSupport   tesseract
-    ++ optionals imwriSupport [ imagemagick7 x265 ];
+    ++ optional imwriSupport imagemagick7;
 
   configureFlags = [
     "--disable-static"