commit a0f50b487e38a5dfae4d15d2404605d156239e09 · pyrox.dev/nixpkgs

+4 -6

pkgs/applications/video/kodi/default.nix

···

       15
       15
        
       , lzo, libcdio, libmodplug, libass, libbluray

     

       16
       16
        
       , sqlite, mysql, nasm, gnutls, libva, wayland

     

       17
       17
        
       , curl, bzip2, zip, unzip, glxinfo, xdpyinfo

     

       18
       18
       +
       , libcec, libcec_platform

     

       18
       19
        
       , dbus_libs ? null, dbusSupport ? true

     

       19
       20
        
       , udev, udevSupport ? true

     

       20
       21
        
       , libusb ? null, usbSupport ? false

     
···

       24
       25
        
       , rtmpdump ? null, rtmpSupport ? true

     

       25
       26
        
       , libvdpau ? null, vdpauSupport ? true

     

       26
       27
        
       , libpulseaudio ? null, pulseSupport ? true

     

       27
       27
       -
       , libcec ? null, cecSupport ? true

     

       28
       28
        
       }:

     

       29
       29
        
       

     

       30
       30
        
       assert dbusSupport  -> dbus_libs != null;

     
···

       33
       33
        
       assert sambaSupport -> samba != null;

     

       34
       34
        
       assert vdpauSupport -> libvdpau != null;

     

       35
       35
        
       assert pulseSupport -> libpulseaudio != null;

     

       36
       36
       -
       assert cecSupport   -> libcec != null;

     

       37
       36
        
       assert rtmpSupport  -> rtmpdump != null;

     

       38
       37
        
       

     

       39
       38
        
       let

     
···

       69
       68
        
             lzo libcdio libmodplug libass libbluray

     

       70
       69
        
             sqlite mysql.lib nasm avahi libdvdcss lame

     

       71
       70
        
             curl bzip2 zip unzip glxinfo xdpyinfo

     

       71
       71
       +
             libcec libcec_platform

     

       72
       72
        
           ]

     

       73
       73
        
           ++ lib.optional dbusSupport dbus_libs

     

       74
       74
        
           ++ lib.optional udevSupport udev

     
···

       76
       76
        
           ++ lib.optional sambaSupport samba

     

       77
       77
        
           ++ lib.optional vdpauSupport libvdpau

     

       78
       78
        
           ++ lib.optional pulseSupport libpulseaudio

     

       79
       79
       -
           ++ lib.optional cecSupport libcec

     

       80
       79
        
           ++ lib.optional rtmpSupport rtmpdump;

     

       81
       80
        
       

     

       82
       81
        
           dontUseCmakeConfigure = true;

     
···

       93
       92
        
             ./bootstrap

     

       94
       93
        
           '';

     

       95
       94
        
       

     

       96
       96
       -
           configureFlags = [

     

       97
       97
       -
             "--enable-external-libraries"

     

       98
       98
       -
           ]

     

       95
       95
       +
           configureFlags = [ ]

     

       99
       96
        
           ++ lib.optional (!sambaSupport) "--disable-samba"

     

       100
       97
        
           ++ lib.optional vdpauSupport "--enable-vdpau"

     

       101
       98
        
           ++ lib.optional pulseSupport "--enable-pulse"

     
···

       112
       109
        
                 --prefix LD_LIBRARY_PATH ":" "${libmad}/lib" \

     

       113
       110
        
                 --prefix LD_LIBRARY_PATH ":" "${libvdpau}/lib" \

     

       114
       111
        
                 --prefix LD_LIBRARY_PATH ":" "${libcec}/lib" \

     

       112
       112
       +
                 --prefix LD_LIBRARY_PATH ":" "${libcec_platform}/lib" \

     

       115
       113
        
                 --prefix LD_LIBRARY_PATH ":" "${rtmpdump}/lib"

     

       116
       114
        
             done

     

       117
       115
        
           '';

+7 -5

pkgs/development/libraries/libcec/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, autoreconfHook, pkgconfig, udev }:

     

       1
       1
       +
       { stdenv, fetchurl, cmake, pkgconfig, udev, libcec_platform }:

     

       2
       2
        
       

     

       3
       3
       -
       let version = "2.2.0"; in

     

       3
       3
       +
       let version = "3.0.1"; in

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation {

     

       6
       6
        
         name = "libcec-${version}";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchurl {

     

       9
       9
       -
           url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}-repack.tar.gz";

     

       10
       10
       -
           sha256 = "1kdfak8y96v14d5vp2apkjjs0fvvim9phc0nkhlq5pjlagk8v32x";

     

       9
       9
       +
           url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz";

     

       10
       10
       +
           sha256 = "0gi5gq8pz6vfdx80pimx23d5g243zzgmc7s8wpb686csjk470dky";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
       -
         buildInputs = [ autoreconfHook pkgconfig udev ];

     

       13
       13
       +
         buildInputs = [ cmake pkgconfig udev libcec_platform ];

     

       14
       14
       +
       

     

       15
       15
       +
         cmakeFlags = [ "-DBUILD_SHARED_LIBS=1" ];

     

       14
       16
        
       

     

       15
       17
        
         # Fix dlopen path

     

       16
       18
        
         patchPhase = ''

+23

pkgs/development/libraries/libcec/platform.nix

···

       1
       1
       +
       { stdenv, fetchurl, cmake }:

     

       2
       2
       +
       

     

       3
       3
       +
       let version = "1.0.10"; in

     

       4
       4
       +
       

     

       5
       5
       +
       stdenv.mkDerivation {

     

       6
       6
       +
         name = "libcec-${version}";

     

       7
       7
       +
       

     

       8
       8
       +
         src = fetchurl {

     

       9
       9
       +
           url = "https://github.com/Pulse-Eight/platform/archive/${version}.tar.gz";

     

       10
       10
       +
           sha256 = "1kdmi9b62nky4jrb5519ddnw5n7s7m6qyj7rzhg399f0n6f278vb";

     

       11
       11
       +
         };

     

       12
       12
       +
       

     

       13
       13
       +
         nativeBuildInputs = [ cmake ];

     

       14
       14
       +
       

     

       15
       15
       +
         meta = with stdenv.lib; {

     

       16
       16
       +
           description = "Platform library for libcec and Kodi addons";

     

       17
       17
       +
           homepage = "https://github.com/Pulse-Eight/platform";

     

       18
       18
       +
           repositories.git = "https://github.com/Pulse-Eight/libcec.git";

     

       19
       19
       +
           license = stdenv.lib.licenses.gpl2Plus;

     

       20
       20
       +
           platforms = platforms.linux;

     

       21
       21
       +
           maintainers = [ maintainers.titanous ];

     

       22
       22
       +
         };

     

       23
       23
       +
       }

pkgs/top-level/all-packages.nix

···

       6769
       6769
        
           else libcanberra;

     

       6770
       6770
        
       

     

       6771
       6771
        
         libcec = callPackage ../development/libraries/libcec { };

     

       6772
       6772
       +
         libcec_platform = callPackage ../development/libraries/libcec/platform.nix { };

     

       6772
       6773
        
       

     

       6773
       6774
        
         libcello = callPackage ../development/libraries/libcello {};

     

       6774
       6775