summaryrefslogtreecommitdiffstats
path: root/pkgs/applications
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2017-02-26 10:25:55 +0100
committerGitHub <noreply@github.com>2017-02-26 10:25:55 +0100
commit70b610674e123b016a41e5b85c9b1454a3902487 (patch)
treef88a70b7fbabe0f851004269932fafa866f2b071 /pkgs/applications
parent242f6caac6e4033d0ff2827d87da807a629bc7b4 (diff)
parentbbc9b1ab2c92c7d695ac70068ac8bbf433790a36 (diff)
Merge pull request #23189 from LnL7/darwin-mpv
mpv: disable drmSupport on darwin
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/video/mpv/default.nix9
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 960dabd75695..021c09a47e68 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -31,7 +31,7 @@
, libpngSupport ? true, libpng ? null
, youtubeSupport ? true, youtube-dl ? null
, vaapiSupport ? true, libva ? null
-, drmSupport ? true, libdrm ? null
+, drmSupport ? !stdenv.isDarwin, libdrm ? null
, vapoursynthSupport ? false, vapoursynth ? null
, jackaudioSupport ? false, libjack2 ? null
@@ -114,7 +114,9 @@ in stdenv.mkDerivation rec {
buildInputs = [
ffmpeg_3_2 freetype libass libpthreadstubs
lua lua5_sockets libuchardet
- ] ++ optional alsaSupport alsaLib
+ ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+ libiconv Cocoa CoreAudio ])
+ ++ optional alsaSupport alsaLib
++ optional xvSupport libXv
++ optional theoraSupport libtheora
++ optional xineramaSupport libXinerama
@@ -122,9 +124,6 @@ in stdenv.mkDerivation rec {
++ optional bluraySupport libbluray
++ optional jackaudioSupport libjack2
++ optional pulseSupport libpulseaudio
- ++ optional stdenv.isDarwin libiconv
- ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
- Cocoa CoreAudio ])
++ optional rubberbandSupport rubberband
++ optional screenSaverSupport libXScrnSaver
++ optional vdpauSupport libvdpau