Unverified Commit 4abac055 authored by asymmetric's avatar asymmetric Committed by GitHub
Browse files

mixxx: 2.4.2 -> 2.5.0 (#368403)

Changes performed:

- build with Qt6, as per upstream recommendation
- use qtWrapperArgs attr, as shown in Nixpkgs manual
- fix license
- add changelog
parent 2c0af53c
Loading
Loading
Loading
Loading
+13 −17
Original line number Diff line number Diff line
{
  lib,
  stdenv,
  mkDerivation,
  fetchFromGitHub,
  chromaprint,
  cmake,
@@ -38,11 +37,11 @@
  portaudio,
  portmidi,
  protobuf,
  qt5compat,
  qtbase,
  qtdeclarative,
  qtkeychain,
  qtscript,
  qtsvg,
  qtx11extras,
  rubberband,
  serd,
  sord,
@@ -53,28 +52,26 @@
  upower,
  vamp-plugin-sdk,
  wavpack,
  wrapGAppsHook3,
  wrapQtAppsHook,
}:

mkDerivation rec {
stdenv.mkDerivation rec {
  pname = "mixxx";
  version = "2.4.2";
  version = "2.5.0";

  src = fetchFromGitHub {
    owner = "mixxxdj";
    repo = "mixxx";
    rev = version;
    hash = "sha256-YfpFRLosIIND+HnZN+76ZY0dQqEJaFkWZS84gZOCdfc=";
    hash = "sha256-1ZE2hVwacZve0+IOQs+htK/kl7zFsOWkh/KcrnI6u/M=";
  };

  nativeBuildInputs = [
    cmake
    pkg-config
    wrapGAppsHook3
    wrapQtAppsHook
  ];

  dontWrapGApps = true;

  buildInputs = [
    chromaprint
    faad2
@@ -109,11 +106,11 @@ mkDerivation rec {
    portaudio
    portmidi
    protobuf
    qt5compat
    qtbase
    qtdeclarative
    qtkeychain
    qtscript
    qtsvg
    qtx11extras
    rubberband
    serd
    sord
@@ -126,9 +123,7 @@ mkDerivation rec {
    wavpack
  ];

  preFixup = ''
    qtWrapperArgs+=(--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive ''${gappsWrapperArgs[@]})
  '';
  qtWrapperArgs = [ "--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive" ];

  # mixxx installs udev rules to DATADIR instead of SYSCONFDIR
  # let's disable this and install udev rules manually via postInstall
@@ -151,10 +146,11 @@ mkDerivation rec {
    homepage = "https://mixxx.org";
    description = "Digital DJ mixing software";
    mainProgram = "mixxx";
    license = licenses.gpl2Plus;
    changelog = "https://github.com/mixxxdj/mixxx/blob/${version}/CHANGELOG.md";
    license = licenses.gpl2;
    maintainers = with maintainers; [
      bfortz
      benley
      bfortz
    ];
    platforms = platforms.linux;
  };
+1 −1
Original line number Diff line number Diff line
@@ -14602,7 +14602,7 @@ with pkgs;
  minitube = libsForQt5.callPackage ../applications/video/minitube { };
  mixxx = libsForQt5.callPackage ../applications/audio/mixxx { };
  mixxx = qt6Packages.callPackage ../applications/audio/mixxx { };
  mldonkey = callPackage ../applications/networking/p2p/mldonkey {
    ocamlPackages = ocaml-ng.ocamlPackages_4_14_unsafe_string;