Unverified Commit bb21c060 authored by Benjamin Staffin's avatar Benjamin Staffin Committed by GitHub
Browse files

Merge pull request #290571 from benley/mixxx-2.4.0 

mixxx: 2.3.6 -> 2.4.0
parents f659f0e3 15054933

pkgs/applications/audio/mixxx/default.nix

+10 −2
Original line number Diff line number Diff line
@@ -8,10 +8,13 @@ 
, ffmpeg

, fftw

, flac

, gbenchmark

, glibcLocales

, gtest

, hidapi

, lame

, libebur128

, libdjinterop

, libGLU

, libid3tag

, libkeyfinder
@@ -26,6 +29,7 @@ 
, libxcb

, lilv

, lv2

, microsoft-gsl

, mp4v2

, opusfile

, pcre
@@ -52,13 +56,13 @@ 


mkDerivation rec {

  pname = "mixxx";

  version = "2.3.6";

  version = "2.4.0";



  src = fetchFromGitHub {

    owner = "mixxxdj";

    repo = "mixxx";

    rev = version;

    hash = "sha256-VdgCsd/7vMFUleOU0ESoZDQ8yhQSsLZADVi4XI76Ouw=";

    hash = "sha256-JSWUzerm7D6AKq6g/9eRrt3EE2movRdM+VLUg07sLHo=";

  };



  nativeBuildInputs = [ cmake pkg-config ];
@@ -69,12 +73,15 @@ mkDerivation rec { 
    ffmpeg

    fftw

    flac

    gbenchmark

    glibcLocales

    gtest

    hidapi

    lame

    libebur128

    libGLU

    libid3tag

    libdjinterop

    libkeyfinder

    libmad

    libmodplug
@@ -87,6 +94,7 @@ mkDerivation rec { 
    libxcb

    lilv

    lv2

    microsoft-gsl

    mp4v2

    opusfile

    pcre

pkgs/by-name/li/libdjinterop/package.nix

0 → 100644
+45 −0
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, boost

, cmake

, ninja

, pkg-config

, sqlite

, zlib

}:



stdenv.mkDerivation {

  name = "libdjinterop";



  version = "unstable";



  src = fetchFromGitHub {

    owner = "xsco";

    repo = "libdjinterop";

    rev = "0.20.1";

    hash = "sha256-/iXSRJVFPWqUTVz7z0BNWCq5LOqdNuTI+wx/34JAZfc=";

  };



  nativeBuildInputs = [

    cmake

    ninja

    pkg-config

  ];



  outputs = [ "out" "dev" ];



  buildInputs = [

    boost

    sqlite

    zlib

  ];



  meta = with lib; {

    homepage = "https://github.com/xsco/libdjinterop";

    description = "C++ library for access to DJ record libraries";

    license = licenses.lgpl3;

    maintainers = with maintainers; [ benley ];

    platforms = platforms.unix;

  };

}