diff options
| author | Orivej Desh <orivej@gmx.fr> | 2019-07-25 09:23:01 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2019-07-25 09:23:21 +0000 |
| commit | 32fbbc6f9bb1bbda436bbcc4e7bc613c9148221b (patch) | |
| tree | fcc3746d350ac20ff693adb7c40f945274e4d2f6 /pkgs/development/libraries/gstreamer | |
| parent | aabb651b23969ea4c901914db6ca34eb2897f7a0 (diff) | |
| parent | b5d1d50aa90e0780c57fb4b323203ea5056be857 (diff) | |
| download | nixpkgs-32fbbc6f9bb1bbda436bbcc4e7bc613c9148221b.tar nixpkgs-32fbbc6f9bb1bbda436bbcc4e7bc613c9148221b.tar.gz nixpkgs-32fbbc6f9bb1bbda436bbcc4e7bc613c9148221b.tar.bz2 nixpkgs-32fbbc6f9bb1bbda436bbcc4e7bc613c9148221b.tar.lz nixpkgs-32fbbc6f9bb1bbda436bbcc4e7bc613c9148221b.tar.xz nixpkgs-32fbbc6f9bb1bbda436bbcc4e7bc613c9148221b.tar.zst nixpkgs-32fbbc6f9bb1bbda436bbcc4e7bc613c9148221b.zip | |
Merge master into staging
Diffstat (limited to 'pkgs/development/libraries/gstreamer')
| -rw-r--r-- | pkgs/development/libraries/gstreamer/good/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 7ef9fbcc44b..557e3caa722 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { ] ++ optional gtkSupport gtk3 # for gtksink ++ optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ] - ++ optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 libgudev jack2 ] + ++ optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 libgudev ] ++ optionals (stdenv.isLinux && enableJack) [ jack2 ]; |