summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorArthur Gautier <baloo@superbaloo.net>2021-02-20 19:41:48 +0000
committerArthur Gautier <baloo@superbaloo.net>2021-02-26 20:48:34 +0000
commit52eba2efb9818a238bee6eea274a54db9c2dafc4 (patch)
tree9091f679d98dbe99f662c4144a9125a627779bf5 /pkgs
parentc406d55e699ae2d4436eab3db6064aa6ce28aadc (diff)
downloadnixpkgs-52eba2efb9818a238bee6eea274a54db9c2dafc4.tar
nixpkgs-52eba2efb9818a238bee6eea274a54db9c2dafc4.tar.gz
nixpkgs-52eba2efb9818a238bee6eea274a54db9c2dafc4.tar.bz2
nixpkgs-52eba2efb9818a238bee6eea274a54db9c2dafc4.tar.lz
nixpkgs-52eba2efb9818a238bee6eea274a54db9c2dafc4.tar.xz
nixpkgs-52eba2efb9818a238bee6eea274a54db9c2dafc4.tar.zst
nixpkgs-52eba2efb9818a238bee6eea274a54db9c2dafc4.zip
gst_all_1.gst-plugins-bad: adds voaacenc support
Signed-off-by: Arthur Gautier <baloo@superbaloo.net>
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/gstreamer/bad/default.nix8
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index 313a063cae8..89011b9230f 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -1,10 +1,8 @@
 { lib, stdenv
 , fetchurl
-, fetchpatch
 , meson
 , ninja
 , gettext
-, config
 , pkg-config
 , python3
 , gst-plugins-base
@@ -81,6 +79,7 @@
 , x265
 , libxml2
 , srt
+, vo-aacenc
 }:
 
 assert faacSupport -> faac != null;
@@ -99,6 +98,7 @@ in stdenv.mkDerivation rec {
   };
 
   patches = [
+    # Use pkgconfig to inject the includedirs
     ./fix_pkgconfig_includedir.patch
   ];
 
@@ -117,6 +117,8 @@ in stdenv.mkDerivation rec {
   buildInputs = [
     gst-plugins-base
     orc
+    # gobject-introspection has to be in both nativeBuildInputs and
+    # buildInputs. The build tries to link against libgirepository-1.0.so
     gobject-introspection
     faad2
     libass
@@ -163,6 +165,7 @@ in stdenv.mkDerivation rec {
     libxml2
     libintl
     srt
+    vo-aacenc
   ] ++ optionals enableZbar [
     zbar
   ] ++ optionals faacSupport [
@@ -241,7 +244,6 @@ in stdenv.mkDerivation rec {
     "-Dsvthevcenc=disabled" # required `SvtHevcEnc` library not packaged in nixpkgs as of writing
     "-Dteletext=disabled" # required `zvbi` library not packaged in nixpkgs as of writing
     "-Dtinyalsa=disabled" # not packaged in nixpkgs as of writing
-    "-Dvoaacenc=disabled" # required `vo-aacenc` library not packaged in nixpkgs as of writing
     "-Dvoamrwbenc=disabled" # required `vo-amrwbenc` library not packaged in nixpkgs as of writing
     "-Dvulkan=disabled" # Linux-only, and we haven't figured out yet which of the vulkan nixpkgs it needs
     "-Dwasapi=disabled" # not packaged in nixpkgs as of writing / no Windows support