diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-10 01:40:38 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-10 01:40:38 -0400 |
commit | feb648ce59ffbed94c58133eb7aa2761992a35e1 (patch) | |
tree | 59d45f1cce7aa4809d9601124bcc9006a80204b7 /pkgs/applications/video/vlc/default.nix | |
parent | a02be2bd85b37ed8b257e969d9439357844baa24 (diff) | |
parent | 70963b382f3f820ba6d3bc3b3aaf50a2957ec1ff (diff) | |
download | nixlib-feb648ce59ffbed94c58133eb7aa2761992a35e1.tar nixlib-feb648ce59ffbed94c58133eb7aa2761992a35e1.tar.gz nixlib-feb648ce59ffbed94c58133eb7aa2761992a35e1.tar.bz2 nixlib-feb648ce59ffbed94c58133eb7aa2761992a35e1.tar.lz nixlib-feb648ce59ffbed94c58133eb7aa2761992a35e1.tar.xz nixlib-feb648ce59ffbed94c58133eb7aa2761992a35e1.tar.zst nixlib-feb648ce59ffbed94c58133eb7aa2761992a35e1.zip |
Merge commit '70963b382f3f820ba6d3bc3b3aaf50a2957ec1ff' into lib-platform-simplify
Diffstat (limited to 'pkgs/applications/video/vlc/default.nix')
-rw-r--r-- | pkgs/applications/video/vlc/default.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index fffbd5c0ffb4..44c4d317d36a 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -7,7 +7,6 @@ , libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz , libass, libva, libdvbpsi, libdc1394, libraw1394, libopus , libvdpau, libsamplerate, live555, fluidsynth -, onlyLibVLC ? false , qt4 ? null , withQt5 ? false, qtbase ? null, qtx11extras ? null , jackSupport ? false @@ -68,8 +67,7 @@ stdenv.mkDerivation rec { "--enable-vdpau" "--enable-dvdnav" "--enable-samplerate" - ] - ++ optional onlyLibVLC "--disable-vlc"; + ]; enableParallelBuilding = true; |