diff options
| author | Matthew Bauer <matthew.bauer@obsidian.systems> | 2018-07-17 16:11:16 -0400 |
|---|---|---|
| committer | Matthew Bauer <matthew.bauer@obsidian.systems> | 2018-07-18 23:25:20 -0400 |
| commit | 76999cc40e6c4cbfe817b3b6f125ece999ae9b73 (patch) | |
| tree | 0325a27e51eb7bed006c1ef958e6312ac1d995c4 /pkgs/applications/video/kodi | |
| parent | d7d31fea7e7eef8ff4495e75be5dcbb37fb215d0 (diff) | |
| download | nixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar nixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.gz nixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.bz2 nixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.lz nixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.xz nixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.zst nixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.zip | |
treewide: remove aliases in nixpkgs
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.
Misc...
- qtikz: use libsForQt5.callPackage
This ensures we get the right poppler.
- rewrites:
docbook5_xsl -> docbook_xsl_ns
docbook_xml_xslt -> docbook_xsl
diffpdf: fixup
Diffstat (limited to 'pkgs/applications/video/kodi')
| -rw-r--r-- | pkgs/applications/video/kodi/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 64119d2dfc5..776d2732327 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -19,7 +19,7 @@ , libcrossguid, libmicrohttpd , bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn, libpthreadstubs, libtasn1, libXdmcp , libplist, p11-kit, zlib -, dbusSupport ? true, dbus_libs ? null +, dbusSupport ? true, dbus ? null , joystickSupport ? true, cwiid ? null , nfsSupport ? true, libnfs ? null , pulseSupport ? true, libpulseaudio ? null @@ -30,7 +30,7 @@ , vdpauSupport ? true, libvdpau ? null }: -assert dbusSupport -> dbus_libs != null; +assert dbusSupport -> dbus != null; assert nfsSupport -> libnfs != null; assert pulseSupport -> libpulseaudio != null; assert rtmpSupport -> rtmpdump != null; @@ -139,7 +139,7 @@ in stdenv.mkDerivation rec { ffmpeg # libdvdcss libdvdnav libdvdread ] - ++ lib.optional dbusSupport dbus_libs + ++ lib.optional dbusSupport dbus ++ lib.optionals joystickSupport [ cwiid ] ++ lib.optional nfsSupport libnfs ++ lib.optional pulseSupport libpulseaudio |