diff options
| author | Edward Tjörnhammar <ed@cflags.cc> | 2016-02-29 08:31:58 +0100 |
|---|---|---|
| committer | Edward Tjörnhammar <ed@cflags.cc> | 2016-02-29 19:00:46 +0100 |
| commit | 9af50a2e7d735b4a024cb91e2bf720341675031f (patch) | |
| tree | ba4200807b2996479ded9127dc8b563ee05f5fa6 /pkgs/applications/video/kodi/default.nix | |
| parent | 5947f565ed70683660a4464b690b9f025c8ee8db (diff) | |
| download | nixpkgs-9af50a2e7d735b4a024cb91e2bf720341675031f.tar nixpkgs-9af50a2e7d735b4a024cb91e2bf720341675031f.tar.gz nixpkgs-9af50a2e7d735b4a024cb91e2bf720341675031f.tar.bz2 nixpkgs-9af50a2e7d735b4a024cb91e2bf720341675031f.tar.lz nixpkgs-9af50a2e7d735b4a024cb91e2bf720341675031f.tar.xz nixpkgs-9af50a2e7d735b4a024cb91e2bf720341675031f.tar.zst nixpkgs-9af50a2e7d735b4a024cb91e2bf720341675031f.zip | |
kodi: add optional joystick support
Diffstat (limited to 'pkgs/applications/video/kodi/default.nix')
| -rw-r--r-- | pkgs/applications/video/kodi/default.nix | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 5761a443df8..c2b3914f850 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -7,7 +7,7 @@ , libXt, libXmu, libXext, xextproto , libXinerama, libXrandr, randrproto , libXtst, libXfixes, fixesproto, systemd -, SDL, SDL_image, SDL_mixer, alsaLib +, SDL, SDL2, SDL_image, SDL_mixer, alsaLib , mesa, glew, fontconfig, freetype, ftgl , libjpeg, jasper, libpng, libtiff , libmpeg2, libsamplerate, libmad @@ -26,6 +26,7 @@ , rtmpdump ? null, rtmpSupport ? true , libvdpau ? null, vdpauSupport ? true , libpulseaudio ? null, pulseSupport ? true +, joystickSupport ? true }: assert dbusSupport -> dbus_libs != null; @@ -78,7 +79,9 @@ in stdenv.mkDerivation rec { ++ lib.optional sambaSupport samba ++ lib.optional vdpauSupport libvdpau ++ lib.optional pulseSupport libpulseaudio - ++ lib.optional rtmpSupport rtmpdump; + ++ lib.optional rtmpSupport rtmpdump + ++ lib.optional joystickSupport SDL2; + dontUseCmakeConfigure = true; @@ -98,7 +101,8 @@ in stdenv.mkDerivation rec { ++ lib.optional (!sambaSupport) "--disable-samba" ++ lib.optional vdpauSupport "--enable-vdpau" ++ lib.optional pulseSupport "--enable-pulse" - ++ lib.optional rtmpSupport "--enable-rtmp"; + ++ lib.optional rtmpSupport "--enable-rtmp" + ++ lib.optional joystickSupport "--enable-joystick"; postInstall = '' for p in $(ls $out/bin/) ; do @@ -113,7 +117,8 @@ in stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH ":" "${libcec}/lib" \ --prefix LD_LIBRARY_PATH ":" "${libcec_platform}/lib" \ --prefix LD_LIBRARY_PATH ":" "${libass}/lib" \ - --prefix LD_LIBRARY_PATH ":" "${rtmpdump}/lib" + --prefix LD_LIBRARY_PATH ":" "${rtmpdump}/lib" \ + --prefix LD_LIBRARY_PATH ":" "${SDL2}/lib" done ''; |