diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2020-09-25 05:38:03 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@mailbox.org> | 2020-09-26 05:50:24 -0500 |
| commit | e1b7af630fb864311f8e21d517179780b3bb0ccb (patch) | |
| tree | 69727456f936086ec15b0d6182ce7e9a569491cb | |
| parent | d752cc4d7165acb9f3ae536baeb9d701d60d9c59 (diff) | |
cantata: use libvlc
| -rw-r--r-- | pkgs/applications/audio/cantata/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index 95b7dd18425b1..df19ac9422882 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -16,7 +16,7 @@ , withDevices ? true, udisks2 , withDynamic ? true , withHttpServer ? true -, withLibVlc ? false, vlc +, withLibVlc ? false, libvlc , withStreams ? true }: @@ -71,7 +71,7 @@ in mkDerivation { ++ lib.optional withMtp libmtp ++ lib.optional withMusicbrainz libmusicbrainz5 ++ lib.optional withUdisks udisks2 - ++ lib.optional withLibVlc vlc; + ++ lib.optional withLibVlc libvlc; nativeBuildInputs = [ cmake pkgconfig qttools ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d1bd25da338f..2fc82e4c12be4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2634,9 +2634,7 @@ in davix = callPackage ../tools/networking/davix { }; - cantata = libsForQt5.callPackage ../applications/audio/cantata { - inherit vlc; - }; + cantata = libsForQt5.callPackage ../applications/audio/cantata { }; can-utils = callPackage ../os-specific/linux/can-utils { }; |