Skip to content

nixos/no-x-libs: add gst-plugins-bad, gst-plugins-rs #231891

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lilyinstarlight merged 3 commits into from
May 25, 2023
Merged

nixos/no-x-libs: add gst-plugins-bad, gst-plugins-rs #231891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5dc3bb5
gst_all_1.gst-plugins-bad: add option to build without gui libraries
SuperSandro2000 May 14, 2023
94baf8b
nixos/no-x-libs: add gst-plugins-bad
SuperSandro2000 May 14, 2023
34cdc0a
gst_all_1.gst-plugins-rs: fix build if gst-plugins-base is build with…
SuperSandro2000 May 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions nixos/modules/config/no-x-libs.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ with lib;
gpsd = super.gpsd.override { guiSupport = false; };
graphviz = super.graphviz-nox;
gst_all_1 = super.gst_all_1 // {
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; };
};
imagemagick = super.imagemagick.override { libX11Support = false; libXtSupport = false; };
Expand Down
11 changes: 7 additions & 4 deletions pkgs/development/libraries/gstreamer/bad/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
, bluez
, chromaprint
, curl
, directfb
, fdk_aac
, flite
, gsm
Expand Down Expand Up @@ -104,6 +103,7 @@
, microdnsSupport ? false
# Checks meson.is_cross_build(), so even canExecute isn't enough.
, enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform, hotdoc
, guiSupport ? true, directfb
}:

stdenv.mkDerivation rec {
Expand Down Expand Up @@ -185,7 +185,6 @@ stdenv.mkDerivation rec {
gnutls
libGL
libGLU
gtk3
game-music-emu
openssl
libxml2
Expand Down Expand Up @@ -220,7 +219,6 @@ stdenv.mkDerivation rec {
mjpegtools

chromaprint
directfb
flite
libdrm
libgudev
Expand All @@ -237,6 +235,10 @@ stdenv.mkDerivation rec {
serd
sord
sratom
] ++ lib.optionals guiSupport [
gtk3
] ++ lib.optionals (stdenv.isLinux && guiSupport) [
directfb
] ++ lib.optionals stdenv.isDarwin [
# For unknown reasons the order is important, e.g. if
# VideoToolbox is last, we get:
Expand Down Expand Up @@ -297,10 +299,11 @@ stdenv.mkDerivation rec {
"-Ddoc=disabled" # needs gstcuda to be enabled which is Linux-only
"-Dnvcodec=disabled" # Linux-only
"-Dva=disabled" # see comment on `libva` in `buildInputs`
] ++ lib.optionals (!stdenv.isLinux || !guiSupport) [
"-Ddirectfb=disabled"
]
++ lib.optionals stdenv.isDarwin [
"-Dchromaprint=disabled"
"-Ddirectfb=disabled"
"-Dflite=disabled"
"-Dkms=disabled" # renders to libdrm output
"-Dlv2=disabled"
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/libraries/gstreamer/rs/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ let
"reqwest" # tests hang on darwin
"threadshare" # tests cannot bind to localhost on darwin
"webp" # not supported on darwin (upstream crate issue)
] ++ lib.optionals (stdenv.isDarwin && !stdenv.isAarch64) [
] ++ lib.optionals (!gst-plugins-base.glEnabled) [
# these require gstreamer-gl which requires darwin sdk bump
"gtk4"
"livesync"
Expand Down Expand Up @@ -205,7 +205,7 @@ stdenv.mkDerivation rec {
export CSOUND_LIB_DIR=${lib.getLib csound}/lib
'' + lib.optionalString (lib.mutuallyExclusive [ "webrtc" "webrtchttp" ] selectedPlugins) ''
sed -i "/\['gstreamer-webrtc-1\.0', 'gst-plugins-bad', 'gstwebrtc_dep', 'gstwebrtc'\]/d" meson.build
'' + lib.optionalString (stdenv.isDarwin && !stdenv.isAarch64) ''
'' + lib.optionalString (!gst-plugins-base.glEnabled) ''
sed -i "/\['gstreamer-gl-1\.0', 'gst-plugins-base', 'gst_gl_dep', 'gstgl'\]/d" meson.build
'';

Expand Down