chuck: 1.4.1.0 -> 1.4.1.1

This commit is contained in:
Weijia Wang 2022-12-31 17:37:43 +01:00
parent ac3c81faa1
commit d5fc6aaca6
2 changed files with 10 additions and 19 deletions

View file

@ -1,35 +1,27 @@
{ stdenv, lib, fetchurl, alsa-lib, bison, flex, libsndfile, which { stdenv, lib, fetchurl, alsa-lib, bison, flex, libsndfile, which, DarwinTools, xcbuild
, AppKit, Carbon, CoreAudio, CoreMIDI, CoreServices, Kernel , AppKit, Carbon, CoreAudio, CoreMIDI, CoreServices, Kernel, MultitouchSupport
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.4.1.0"; version = "1.4.1.1";
pname = "chuck"; pname = "chuck";
src = fetchurl { src = fetchurl {
url = "http://chuck.cs.princeton.edu/release/files/chuck-${version}.tgz"; url = "http://chuck.cs.princeton.edu/release/files/chuck-${version}.tgz";
sha256 = "sha256-dL+ZrVFeMRPFW4MxUpNvrQKjzwBqVBBf8Rd3xHMZSSg="; sha256 = "sha256-RFnubxUdpy3N4VJeCv4FMp1hCGNWsWjs/AvDpXApD2M=";
}; };
nativeBuildInputs = [ flex bison which ]; nativeBuildInputs = [ flex bison which ]
++ lib.optionals stdenv.isDarwin [ DarwinTools xcbuild ];
buildInputs = [ libsndfile ] buildInputs = [ libsndfile ]
++ lib.optional (!stdenv.isDarwin) alsa-lib ++ lib.optional (!stdenv.isDarwin) alsa-lib
++ lib.optionals stdenv.isDarwin [ AppKit Carbon CoreAudio CoreMIDI CoreServices Kernel ]; ++ lib.optionals stdenv.isDarwin [ AppKit Carbon CoreAudio CoreMIDI CoreServices Kernel MultitouchSupport ];
patches = [ ./darwin-limits.patch ]; patches = [ ./darwin-limits.patch ];
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-missing-sysroot";
NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework MultitouchSupport";
postPatch = ''
substituteInPlace src/core/makefile.x/makefile.osx \
--replace "weak_framework" "framework" \
--replace "MACOSX_DEPLOYMENT_TARGET=10.9" "MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET"
'';
makeFlags = [ "-C src" "DESTDIR=$(out)/bin" ]; makeFlags = [ "-C src" "DESTDIR=$(out)/bin" ];
buildFlags = [ (if stdenv.isDarwin then "osx" else "linux-alsa") ]; buildFlags = [ (if stdenv.isDarwin then "mac" else "linux-alsa") ];
meta = with lib; { meta = with lib; {
description = "Programming language for real-time sound synthesis and music creation"; description = "Programming language for real-time sound synthesis and music creation";
@ -37,7 +29,5 @@ stdenv.mkDerivation rec {
license = licenses.gpl2; license = licenses.gpl2;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ ftrvxmtrx ]; maintainers = with maintainers; [ ftrvxmtrx ];
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
}; };
} }

View file

@ -28119,7 +28119,8 @@ with pkgs;
chromiumDev = lowPrio (chromium.override { channel = "dev"; }); chromiumDev = lowPrio (chromium.override { channel = "dev"; });
chuck = callPackage ../applications/audio/chuck { chuck = callPackage ../applications/audio/chuck {
inherit (darwin.apple_sdk.frameworks) AppKit Carbon CoreAudio CoreMIDI CoreServices Kernel; inherit (darwin) DarwinTools;
inherit (darwin.apple_sdk.frameworks) AppKit Carbon CoreAudio CoreMIDI CoreServices Kernel MultitouchSupport;
}; };
cinelerra = callPackage ../applications/video/cinelerra { }; cinelerra = callPackage ../applications/video/cinelerra { };