public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cantata: use libvlc

Browse Source
This commit is contained in:
Thomas Tuegel 2020-09-25 05:38:03 -05:00
parent d752cc4d71
commit e1b7af630f
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/audio/cantata/default.nix
View File

@ -16,7 +16,7 @@
, withDevices ? true, udisks2 , withDevices ? true, udisks2
, withDynamic ? true , withDynamic ? true
, withHttpServer ? true , withHttpServer ? true
, withLibVlc ? false, vlc , withLibVlc ? false, libvlc
, withStreams ? true , withStreams ? true
}: }:
@ -71,7 +71,7 @@ in mkDerivation {
++ lib.optional withMtp libmtp ++ lib.optional withMtp libmtp
++ lib.optional withMusicbrainz libmusicbrainz5 ++ lib.optional withMusicbrainz libmusicbrainz5
++ lib.optional withUdisks udisks2 ++ lib.optional withUdisks udisks2
++ lib.optional withLibVlc vlc; ++ lib.optional withLibVlc libvlc;
nativeBuildInputs = [ cmake pkgconfig qttools ]; nativeBuildInputs = [ cmake pkgconfig qttools ];

4
pkgs/top-level/all-packages.nix
View File

@ -2634,9 +2634,7 @@ in
davix = callPackage ../tools/networking/davix { }; davix = callPackage ../tools/networking/davix { };
cantata = libsForQt5.callPackage ../applications/audio/cantata { cantata = libsForQt5.callPackage ../applications/audio/cantata { };
inherit vlc;
};
can-utils = callPackage ../os-specific/linux/can-utils { }; can-utils = callPackage ../os-specific/linux/can-utils { };