diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/gstreamer')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix | 2 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/gstreamer/rs/default.nix | 11 |
2 files changed, 3 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix index 9599da0fdf52..8ff8220aa75d 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix @@ -10,6 +10,7 @@ , orc , bzip2 , gettext +, libGL , libv4l , libdv , libavc1394 @@ -129,6 +130,7 @@ stdenv.mkDerivation rec { ]) ++ lib.optionals stdenv.isDarwin [ Cocoa ] ++ lib.optionals stdenv.isLinux [ + libGL libv4l libpulseaudio libavc1394 diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/rs/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/rs/default.nix index e0d324936dd0..ee467f965c81 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/rs/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/rs/default.nix @@ -2,13 +2,11 @@ , stdenv , fetchFromGitLab , fetchpatch -, writeText , rustPlatform , meson , ninja , python3 , pkg-config -, rust , rustc , cargo , cargo-c @@ -205,14 +203,7 @@ stdenv.mkDerivation rec { ) ++ [ (lib.mesonOption "sodium-source" "system") (lib.mesonEnable "doc" enableDocumentation) - ] ++ (let - crossFile = writeText "cross-file.conf" '' - [binaries] - rust = [ 'rustc', '--target', '${rust.toRustTargetSpec stdenv.hostPlatform}' ] - ''; - in lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - "--cross-file=${crossFile}" - ]); + ]; # turn off all auto plugins since we use a list of plugins we generate mesonAutoFeatures = "disabled"; |