Merge pull request #248006 from matthiasbeyer/update-miniaudicle

miniaudicle: 1.4.2.0 -> 1.5.0.7

pkgs/applications/audio/miniaudicle/default.nix

@@ -1,13 +1,14 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, qmake
+, wrapQtAppsHook
+, qscintilla-qt6
 , bison
 , flex
 , which
 , alsa-lib
 , libsndfile
-, qt4
-, qscintilla-qt4
 , libpulseaudio
 , libjack2
 , audioBackend ? "pulse" # "pulse", "alsa", or "jack"
@@ -15,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "miniaudicle";
-  version = "1.4.2.0";
+  version = "1.5.0.7";
 
   src = fetchFromGitHub {
     owner = "ccrma";
     repo = "miniAudicle";
-    rev = "miniAudicle-${finalAttrs.version}";
-    hash = "sha256-NENpqgCCGiVzVE6rYqBu2RwkzWSiGHe7dZVwBfSomEo=";
+    rev = "chuck-${finalAttrs.version}";
+    hash = "sha256-CqsajNLcOp7CS5RsVabWM6APnNh4alSKb2/eoZ7F4Ao=";
     fetchSubmodules = true;
   };
 
@@ -37,20 +38,19 @@ stdenv.mkDerivation (finalAttrs: {
     bison
     flex
     which
+    qmake
+    wrapQtAppsHook
   ];
 
   buildInputs = [
     alsa-lib
     libsndfile
-    qt4
-    qscintilla-qt4
+    qscintilla-qt6
   ] ++ lib.optional (audioBackend == "pulse") libpulseaudio
     ++ lib.optional (audioBackend == "jack")  libjack2;
 
   buildFlags = [ "linux-${audioBackend}" ];
 
-  makeFlags = [ "PREFIX=$(out)" ];
-
   meta = with lib; {
     description = "A light-weight integrated development environment for the ChucK digital audio programming language";
     homepage = "https://audicle.cs.princeton.edu/mini/";

pkgs/development/libraries/qscintilla/default.nix

@@ -3,7 +3,7 @@
 , fetchurl
 , unzip
 , qtbase
-, qtmacextras
+, qtmacextras ? null
 , qmake
 , fixDarwinDylibNames
 }:
@@ -63,5 +63,7 @@ stdenv.mkDerivation rec {
     license = with licenses; [ gpl3 ]; # and commercial
     maintainers = with maintainers; [ peterhoeg ];
     platforms = platforms.unix;
+    # ld: library not found for -lcups
+    broken = stdenv.isDarwin && lib.versionAtLeast qtbase.version "6";
   };
 }

pkgs/top-level/all-packages.nix

@@ -12376,6 +12376,8 @@ with pkgs;
 
   qscintilla-qt4 = callPackage ../development/libraries/qscintilla-qt4 { };
 
+  qscintilla-qt6 = qt6Packages.callPackage ../development/libraries/qscintilla { };
+
   qrcp = callPackage ../tools/networking/qrcp { };
 
   qrscan = callPackage ../tools/misc/qrscan { };
@@ -33711,7 +33713,7 @@ with pkgs;
 
   mikmod = callPackage ../applications/audio/mikmod { };
 
-  miniaudicle = callPackage ../applications/audio/miniaudicle { };
+  miniaudicle = qt6Packages.callPackage ../applications/audio/miniaudicle { };
 
   minidsp = callPackage ../applications/audio/minidsp {
     inherit (darwin.apple_sdk.frameworks) AppKit IOKit;