From 3dac2b2745049820a4f48d83e00b9bbca6db1069 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 25 Jul 2023 17:49:12 +0200 Subject: [PATCH 1/2] qscintilla-qt6: init (cherry picked from commit 717d80c63e50100ee80428fa941e35b92650baad) Signed-off-by: Matthias Beyer Co-authored-by: Francesco Gazzetta --- pkgs/development/libraries/qscintilla/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index 4aff530877a0..5a2b00c54e3e 100644 --- a/pkgs/development/libraries/qscintilla/default.nix +++ b/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"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3a2e7ac1389..e5f2919d3f9e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12303,6 +12303,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 { }; From 9e3106accd3df5a1954832fdafc3359540c9b7a4 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 25 Jul 2023 17:39:25 +0200 Subject: [PATCH 2/2] miniaudicle: 1.4.2.0 -> 1.5.0.7 and qt4 -> qt6 (cherry picked from commit 29902fb475f4490696f9de202e24768e9cdc9ce1) Signed-off-by: Matthias Beyer --- .../applications/audio/miniaudicle/default.nix | 18 +++++++++--------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/audio/miniaudicle/default.nix b/pkgs/applications/audio/miniaudicle/default.nix index 2ff8accecb24..19054da5841c 100644 --- a/pkgs/applications/audio/miniaudicle/default.nix +++ b/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/"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e5f2919d3f9e..458490ecc1ef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33549,7 +33549,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;