BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #248006 from matthiasbeyer/update-miniaudicle

Browse source 
miniaudicle: 1.4.2.0 -> 1.5.0.7
This commit is contained in:
Francesco Gazzetta 2023-08-23 17:06:14 +02:00 committed by GitHub
commit eb46469cfe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkgs/applications/audio/miniaudicle/default.nix
View file

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

4
pkgs/development/libraries/qscintilla/default.nix
View file

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

4
pkgs/top-level/all-packages.nix
View file

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