diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix index 07bee8ecd2786..9841fd94f2d01 100644 --- a/pkgs/development/compilers/orc/default.nix +++ b/pkgs/development/compilers/orc/default.nix @@ -60,6 +60,6 @@ in stdenv.mkDerivation rec { # under the 3-clause BSD license. The rest is 2-clause BSD license. license = with licenses; [ bsd3 bsd2 ]; platforms = platforms.unix; - maintainers = [ ]; + maintainers = with maintainers; [ lilyinstarlight ]; }; } diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 9be43ea4937eb..b94769af76f44 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -45,6 +45,7 @@ , flite , gsm , json-glib +, libajantv2 , libaom , libdc1394 , libde265 @@ -152,7 +153,7 @@ stdenv.mkDerivation rec { liblc3 libass libkate - webrtc-audio-processing_1 # required by isac + webrtc-audio-processing_1 libbs2b libmodplug openjpeg @@ -220,6 +221,7 @@ stdenv.mkDerivation rec { chromaprint flite + libajantv2 libdrm libgudev sbc @@ -263,7 +265,7 @@ stdenv.mkDerivation rec { "-Damfcodec=disabled" # Windows-only "-Davtp=disabled" "-Ddirectshow=disabled" # Windows-only - "-Dqt6d3d11=disabled" + "-Dqt6d3d11=disabled" # Windows-only "-Ddts=disabled" # required `libdca` library not packaged in nixpkgs as of writing, and marked as "BIG FAT WARNING: libdca is still in early development" "-Dzbar=${if enableZbar then "enabled" else "disabled"}" "-Dfaac=${if faacSupport then "enabled" else "disabled"}" @@ -283,7 +285,6 @@ stdenv.mkDerivation rec { "-Dmusepack=disabled" "-Dopenni2=disabled" # not packaged in nixpkgs as of writing "-Dopensles=disabled" # not packaged in nixpkgs as of writing - "-Dsvtav1=disabled" # not packaged in nixpkgs as of writing "-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 @@ -307,8 +308,8 @@ stdenv.mkDerivation rec { "-Dva=disabled" # see comment on `libva` in `buildInputs` ] ++ lib.optionals (!stdenv.isLinux || !guiSupport) [ "-Ddirectfb=disabled" - ] - ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ + "-Daja=disabled" "-Dchromaprint=disabled" "-Dflite=disabled" "-Dkms=disabled" # renders to libdrm output @@ -317,6 +318,7 @@ stdenv.mkDerivation rec { "-Dspandsp=disabled" "-Ddvb=disabled" "-Dfbdev=disabled" + "-Duvcgadget=disabled" # requires gudev "-Duvch264=disabled" # requires gudev "-Dv4l2codecs=disabled" # requires gudev "-Dladspa=disabled" # requires lrdf @@ -324,7 +326,7 @@ stdenv.mkDerivation rec { "-Dqsv=disabled" # Linux (and Windows) x86 only ] ++ lib.optionals (!gst-plugins-base.glEnabled) [ "-Dgl=disabled" - ] ++ lib.optionals (!gst-plugins-base.waylandEnabled) [ + ] ++ lib.optionals (!gst-plugins-base.waylandEnabled || !guiSupport) [ "-Dgtk3=disabled" # Wayland-based GTK sink "-Dwayland=disabled" ] ++ lib.optionals (!gst-plugins-base.glEnabled) [ diff --git a/pkgs/development/libraries/gstreamer/bad/fix-paths.patch b/pkgs/development/libraries/gstreamer/bad/fix-paths.patch index 1c667c05494af..207ed16aa0b08 100644 --- a/pkgs/development/libraries/gstreamer/bad/fix-paths.patch +++ b/pkgs/development/libraries/gstreamer/bad/fix-paths.patch @@ -7,7 +7,7 @@ index 11718b8..d4144c1 100644 module = g_module_open (filename, G_MODULE_BIND_LAZY); + -+ if (module == NULL) { ++ if (module == nullptr) { + module = g_module_open ("@driverLink@/lib/" CUDA_LIBNAME, G_MODULE_BIND_LAZY); + } + diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 55953b54504c1..72dbef5c6dee0 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -126,6 +126,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional (!enableAlsa) "-Dalsa=disabled" ++ lib.optional (!enableCdparanoia) "-Dcdparanoia=disabled" ++ lib.optionals stdenv.isDarwin [ + "-Ddrm=disabled" "-Dlibvisual=disabled" ]; diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 14faa5fd586ff..05c1d0c0f6324 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -106,7 +106,6 @@ stdenv.mkDerivation rec { bzip2 libdv libvpx - libdrm speex opencore-amr flac @@ -148,6 +147,7 @@ stdenv.mkDerivation rec { ]) ++ lib.optionals stdenv.isDarwin [ Cocoa ] ++ lib.optionals stdenv.isLinux [ + libdrm libGL libv4l libpulseaudio diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index 52643f57903a0..40b6e169c225a 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -15,7 +15,6 @@ , x264 , libintl , lib -, opencore-amr , IOKit , CoreFoundation , DiskArbitration @@ -49,7 +48,6 @@ stdenv.mkDerivation rec { gst-plugins-base orc libintl - opencore-amr ] ++ lib.optionals enableGplPlugins [ a52dec libcdio diff --git a/pkgs/development/libraries/libajantv2/default.nix b/pkgs/development/libraries/libajantv2/default.nix index 89d609b327abe..278752b18738d 100644 --- a/pkgs/development/libraries/libajantv2/default.nix +++ b/pkgs/development/libraries/libajantv2/default.nix @@ -28,6 +28,21 @@ stdenv.mkDerivation rec { pkg-config ]; + postInstall = '' + mkdir -p "$out/lib/pkgconfig" + cat >"$out/lib/pkgconfig/libajantv2.pc" <