cantata: use libvlc
parent
d752cc4d71
commit
e1b7af630f
|
@ -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 ];
|
||||
|
||||
|
|
|
@ -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 { };
|
||||
|
||||
|
|
Loading…
Reference in New Issue