alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #231185 from SuperSandro2000/gst-plugins-good-nox

Browse source 
nixos/no-x-libs: fix gst_all_1.gst_plugins_good
This commit is contained in:
Lily Foster 2023-06-07 21:30:36 -04:00 committed by GitHub
parent 83e7490bd0 5896d330e9
commit 7626ea262e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
nixos/modules/config/no-x-libs.nix
View file

@ -39,7 +39,8 @@ with lib;
graphviz = super.graphviz-nox; graphviz = super.graphviz-nox;
gst_all_1 = super.gst_all_1 // { gst_all_1 = super.gst_all_1 // {
gst-plugins-bad = super.gst_all_1.gst-plugins-bad.override { guiSupport = false; }; gst-plugins-bad = super.gst_all_1.gst-plugins-bad.override { guiSupport = false; };
gst-plugins-base = super.gst_all_1.gst-plugins-base.override { enableX11 = false; }; gst-plugins-base = super.gst_all_1.gst-plugins-base.override { enableWayland = false; enableX11 = false; };
gst-plugins-good = super.gst_all_1.gst-plugins-good.override { enableX11 = false; };
}; };
imagemagick = super.imagemagick.override { libX11Support = false; libXtSupport = false; }; imagemagick = super.imagemagick.override { libX11Support = false; libXtSupport = false; };
imagemagickBig = super.imagemagickBig.override { libX11Support = false; libXtSupport = false; }; imagemagickBig = super.imagemagickBig.override { libX11Support = false; libXtSupport = false; };

17
pkgs/development/libraries/gstreamer/good/default.nix
View file

@ -34,13 +34,10 @@
, qt6Support ? false, qt6 , qt6Support ? false, qt6
, raspiCameraSupport ? false, libraspberrypi , raspiCameraSupport ? false, libraspberrypi
, enableJack ? true, libjack2 , enableJack ? true, libjack2
, libXdamage , enableX11 ? stdenv.isLinux, xorg
, libXext
, libXfixes
, ncurses , ncurses
, wayland , wayland
, wayland-protocols , wayland-protocols
, xorg
, libgudev , libgudev
, wavpack , wavpack
, glib , glib
@ -105,15 +102,14 @@ stdenv.mkDerivation rec {
mpg123 mpg123
twolame twolame
libintl libintl
libXdamage
libXext
libXfixes
ncurses ncurses
xorg.libXfixes
xorg.libXdamage
wavpack wavpack
] ++ lib.optionals raspiCameraSupport [ ] ++ lib.optionals raspiCameraSupport [
libraspberrypi libraspberrypi
] ++ lib.optionals enableX11 [
xorg.libXext
xorg.libXfixes
xorg.libXdamage
] ++ lib.optionals gtkSupport [ ] ++ lib.optionals gtkSupport [
# for gtksink # for gtksink
gtk3 gtk3
@ -149,6 +145,8 @@ stdenv.mkDerivation rec {
"-Dqt6=disabled" "-Dqt6=disabled"
] ++ lib.optionals (!gtkSupport) [ ] ++ lib.optionals (!gtkSupport) [
"-Dgtk3=disabled" "-Dgtk3=disabled"
] ++ lib.optionals (!enableX11) [
"-Dximagesrc=disabled" # Linux-only
] ++ lib.optionals (!enableJack) [ ] ++ lib.optionals (!enableJack) [
"-Djack=disabled" "-Djack=disabled"
] ++ lib.optionals (!stdenv.isLinux) [ ] ++ lib.optionals (!stdenv.isLinux) [
@ -158,7 +156,6 @@ stdenv.mkDerivation rec {
"-Dpulse=disabled" # TODO check if we can keep this enabled "-Dpulse=disabled" # TODO check if we can keep this enabled
"-Dv4l2-gudev=disabled" # Linux-only "-Dv4l2-gudev=disabled" # Linux-only
"-Dv4l2=disabled" # Linux-only "-Dv4l2=disabled" # Linux-only
"-Dximagesrc=disabled" # Linux-only
] ++ lib.optionals (!raspiCameraSupport) [ ] ++ lib.optionals (!raspiCameraSupport) [
"-Drpicamsrc=disabled" "-Drpicamsrc=disabled"
]; ];