diff options
| author | Daniel Peebles <copumpkin@users.noreply.github.com> | 2017-03-16 22:28:19 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-16 22:28:19 -0400 |
| commit | 2eb48daa94227ff10aeca8fdccc6e570c2f0f7c4 (patch) | |
| tree | 6742b32fc0f1d60ddcf9d6f5fe65f98097d6130b /pkgs | |
| parent | bc26feb1d6edfce6b43d0d82e418e0a7c4551c78 (diff) | |
| parent | db05f414bd7eb37d34fbc6e9009e11ce638a3a16 (diff) | |
| download | nixlib-2eb48daa94227ff10aeca8fdccc6e570c2f0f7c4.tar nixlib-2eb48daa94227ff10aeca8fdccc6e570c2f0f7c4.tar.gz nixlib-2eb48daa94227ff10aeca8fdccc6e570c2f0f7c4.tar.bz2 nixlib-2eb48daa94227ff10aeca8fdccc6e570c2f0f7c4.tar.lz nixlib-2eb48daa94227ff10aeca8fdccc6e570c2f0f7c4.tar.xz nixlib-2eb48daa94227ff10aeca8fdccc6e570c2f0f7c4.tar.zst nixlib-2eb48daa94227ff10aeca8fdccc6e570c2f0f7c4.zip | |
Merge pull request #23974 from cleverca22/qtmultimedia
qtmultimedia-5.7: disable alsa on darwin
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.7/qtmultimedia.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/qt-5/5.7/qtmultimedia.nix b/pkgs/development/libraries/qt-5/5.7/qtmultimedia.nix index 7c1cc5da07e3..a48dd38ae6d2 100644 --- a/pkgs/development/libraries/qt-5/5.7/qtmultimedia.nix +++ b/pkgs/development/libraries/qt-5/5.7/qtmultimedia.nix @@ -1,4 +1,4 @@ -{ qtSubmodule, qtbase, qtdeclarative, pkgconfig +{ stdenv, qtSubmodule, qtbase, qtdeclarative, pkgconfig , alsaLib, gstreamer, gst-plugins-base, libpulseaudio }: @@ -6,7 +6,7 @@ qtSubmodule { name = "qtmultimedia"; qtInputs = [ qtbase qtdeclarative ]; buildInputs = [ - pkgconfig alsaLib gstreamer gst-plugins-base libpulseaudio - ]; + pkgconfig gstreamer gst-plugins-base libpulseaudio + ] ++ stdenv.lib.optional stdenv.isLinux alsaLib; qmakeFlags = [ "GST_VERSION=1.0" ]; } |