Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 939976a9295c
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 81bc738fc0a9
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 30, 2020

  1. cantata: make qtmultimedia and vlc optional 

    Upstream defaults vlc to off. Its only purpose is as an alternative to
QtMultimedia for "MPD HTTP stream playback" [1]. Similarly, provide a
toggle for qtmultimedia, in case somebody wants to disable HTTP stream
playback.

[1] https://github.com/CDrummond/cantata/blob/efa907c8e03d052718f14834eb968da86d1c34d8/CMakeLists.txt#L51
    @cole-h
    cole-h committed Mar 30, 2020
    Copy the full SHA
    23f4ac9 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2020

  1. Merge pull request #83799 from cole-h/cantata 

    cantata: make qtmultimedia and vlc optional
    @peterhoeg
    peterhoeg committed Apr 3, 2020
    Copy the full SHA
    81bc738 View commit details
    Browse the repository at this point in the history