Unverified Commit 2c4af10a authored by Austin Horstman's avatar Austin Horstman Committed by GitHub
Browse files

cantata: pin to ffmpeg_6; move to by-name; mark darwin as badPlatform (#353982)

parents b787039d beef1f17

pkgs/applications/audio/cantata/default.nix→pkgs/by-name/ca/cantata/package.nix

+202 −0
Original line number Diff line number Diff line 
{ mkDerivation

, lib

, fetchFromGitHub

, cmake

, pkg-config

, qtbase

, qtsvg

, qttools

, perl

{

  stdenv,

  lib,

  fetchFromGitHub,

  cmake,

  pkg-config,

  qt5,

  perl,



  # Cantata doesn't build with cdparanoia enabled so we disable that

  # default for now until I (or someone else) figure it out.

, withCdda ? false

, cdparanoia

, withCddb ? false

, libcddb

, withLame ? false

, lame

, withMusicbrainz ? false

, libmusicbrainz5

  withCdda ? false,

  cdparanoia,

  withCddb ? false,

  libcddb,

  withLame ? false,

  lame,

  withMusicbrainz ? false,

  libmusicbrainz5,



, withTaglib ? true

, taglib

, taglib_extras

, withHttpStream ? true

, qtmultimedia

, withReplaygain ? true

, ffmpeg

, speex

, mpg123

, withMtp ? true

, libmtp

, withOnlineServices ? true

, withDevices ? true

, udisks2

, withDynamic ? true

, withHttpServer ? true

, withLibVlc ? false

, libvlc

, withStreams ? true

  withTaglib ? true,

  taglib,

  taglib_extras,

  withHttpStream ? true,

  withReplaygain ? true,

  ffmpeg,

  speex,

  mpg123,

  withMtp ? true,

  libmtp,

  withOnlineServices ? true,

  withDevices ? true,

  udisks2,

  withDynamic ? true,

  withHttpServer ? true,

  withLibVlc ? false,

  libvlc,

  withStreams ? true,

}:



# Inter-dependencies.
@@ -51,40 +49,117 @@ assert withReplaygain -> withTaglib; 
assert withLibVlc -> withHttpStream;



let

  fstat = x: fn:

    "-DENABLE_${fn}=${if x then "ON" else "OFF"}";

  fstat = x: fn: "-DENABLE_${fn}=${if x then "ON" else "OFF"}";



  withUdisks = (withTaglib && withDevices);

  withUdisks = (withTaglib && withDevices && stdenv.hostPlatform.isLinux);



  options = [

    { names = [ "CDDB" ]; enable = withCddb; pkgs = [ libcddb ]; }

    { names = [ "CDPARANOIA" ]; enable = withCdda; pkgs = [ cdparanoia ]; }

    { names = [ "DEVICES_SUPPORT" ]; enable = withDevices; pkgs = [ ]; }

    { names = [ "DYNAMIC" ]; enable = withDynamic; pkgs = [ ]; }

    { names = [ "FFMPEG" "MPG123" "SPEEXDSP" ]; enable = withReplaygain; pkgs = [ ffmpeg speex mpg123 ]; }

    { names = [ "HTTPS_SUPPORT" ]; enable = true; pkgs = [ ]; }

    { names = [ "HTTP_SERVER" ]; enable = withHttpServer; pkgs = [ ]; }

    { names = [ "HTTP_STREAM_PLAYBACK" ]; enable = withHttpStream; pkgs = [ qtmultimedia ]; }

    { names = [ "LAME" ]; enable = withLame; pkgs = [ lame ]; }

    { names = [ "LIBVLC" ]; enable = withLibVlc; pkgs = [ libvlc ]; }

    { names = [ "MTP" ]; enable = withMtp; pkgs = [ libmtp ]; }

    { names = [ "MUSICBRAINZ" ]; enable = withMusicbrainz; pkgs = [ libmusicbrainz5 ]; }

    { names = [ "ONLINE_SERVICES" ]; enable = withOnlineServices; pkgs = [ ]; }

    { names = [ "STREAMS" ]; enable = withStreams; pkgs = [ ]; }

    { names = [ "TAGLIB" "TAGLIB_EXTRAS" ]; enable = withTaglib; pkgs = [ taglib taglib_extras ]; }

    { names = [ "UDISKS2" ]; enable = withUdisks; pkgs = [ udisks2 ]; }

    {

      names = [ "CDDB" ];

      enable = withCddb;

      pkgs = [ libcddb ];

    }

    {

      names = [ "CDPARANOIA" ];

      enable = withCdda;

      pkgs = [ cdparanoia ];

    }

    {

      names = [ "DEVICES_SUPPORT" ];

      enable = withDevices;

      pkgs = [ ];

    }

    {

      names = [ "DYNAMIC" ];

      enable = withDynamic;

      pkgs = [ ];

    }

    {

      names = [

        "FFMPEG"

        "MPG123"

        "SPEEXDSP"

      ];

      enable = withReplaygain;

      pkgs = [

        ffmpeg

        speex

        mpg123

      ];

    }

    {

      names = [ "HTTPS_SUPPORT" ];

      enable = true;

      pkgs = [ ];

    }

    {

      names = [ "HTTP_SERVER" ];

      enable = withHttpServer;

      pkgs = [ ];

    }

    {

      names = [ "HTTP_STREAM_PLAYBACK" ];

      enable = withHttpStream;

      pkgs = [ qt5.qtmultimedia ];

    }

    {

      names = [ "LAME" ];

      enable = withLame;

      pkgs = [ lame ];

    }

    {

      names = [ "LIBVLC" ];

      enable = withLibVlc;

      pkgs = [ libvlc ];

    }

    {

      names = [ "MTP" ];

      enable = withMtp;

      pkgs = [ libmtp ];

    }

    {

      names = [ "MUSICBRAINZ" ];

      enable = withMusicbrainz;

      pkgs = [ libmusicbrainz5 ];

    }

    {

      names = [ "ONLINE_SERVICES" ];

      enable = withOnlineServices;

      pkgs = [ ];

    }

    {

      names = [ "STREAMS" ];

      enable = withStreams;

      pkgs = [ ];

    }

    {

      names = [

        "TAGLIB"

        "TAGLIB_EXTRAS"

      ];

      enable = withTaglib;

      pkgs = [

        taglib

        taglib_extras

      ];

    }

    {

      names = [ "UDISKS2" ];

      enable = withUdisks;

      pkgs = [ udisks2 ];

    }

  ];



in

mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "cantata";

  version = "2.5.0";



  src = fetchFromGitHub {

    owner = "CDrummond";

    repo = "cantata";

    rev = "v${version}";

    sha256 = "sha256-UaZEKZvCA50WsdQSSJQQ11KTK6rM4ouCHDX7pn3NlQw=";

    rev = "v${finalAttrs.version}";

    hash = "sha256-UaZEKZvCA50WsdQSSJQQ11KTK6rM4ouCHDX7pn3NlQw=";

  };



  patches = [
@@ -99,24 +174,29 @@ mkDerivation rec { 
  '';



  buildInputs = [

    qtbase

    qtsvg

    qt5.qtbase

    qt5.qtsvg

    (perl.withPackages (ppkgs: with ppkgs; [ URI ]))

  ]

  ++ lib.flatten (builtins.catAttrs "pkgs" (builtins.filter (e: e.enable) options));

  ] ++ lib.flatten (builtins.catAttrs "pkgs" (builtins.filter (e: e.enable) options));



  nativeBuildInputs = [ cmake pkg-config qttools ];

  nativeBuildInputs = [

    cmake

    pkg-config

    qt5.qttools

    qt5.wrapQtAppsHook

  ];



  cmakeFlags = lib.flatten (map (e: map (f: fstat e.enable f) e.names) options);



  meta = with lib; {

  meta = {

    description = "Graphical client for MPD";

    mainProgram = "cantata";

    homepage = "https://github.com/cdrummond/cantata";

    license = licenses.gpl3Only;

    maintainers = with maintainers; [ peterhoeg ];

    license = lib.licenses.gpl3Only;

    maintainers = with lib.maintainers; [ peterhoeg ];

    # Technically, Cantata should run on Darwin/Windows so if someone wants to

    # bother figuring that one out, be my guest.

    platforms = platforms.linux;

    platforms = lib.platforms.unix;

    badPlatforms = lib.platforms.darwin;

  };

}
 
})

pkgs/top-level/all-packages.nix

+4 −2
Original line number Diff line number Diff line
@@ -6117,8 +6117,6 @@ with pkgs; 














  davix-copy = davix.override { enableThirdPartyCopy = true; };



























  cantata = libsForQt5.callPackage ../applications/audio/cantata { };



























  cantoolz = callPackage ../tools/networking/cantoolz { };





























  can-utils = callPackage ../os-specific/linux/can-utils { };










@@ -38373,4 +38371,8 @@ with pkgs;













  dillo = callPackage ../by-name/di/dillo/package.nix {















    fltk = fltk13;















  };

























  cantata = callPackage ../by-name/ca/cantata/package.nix {













    ffmpeg = ffmpeg_6;













  };















}