chuck: fix darwin build
This commit is contained in:
parent
adf11dcc01
commit
33aa3f3488
58
pkgs/applications/audio/chuck/clang.patch
Normal file
58
pkgs/applications/audio/chuck/clang.patch
Normal file
@ -0,0 +1,58 @@
|
|||||||
|
diff --git a/src/ugen_osc.cpp b/src/ugen_osc.cpp
|
||||||
|
index 6b93c6b..dbefe4f 100644
|
||||||
|
--- a/src/ugen_osc.cpp
|
||||||
|
+++ b/src/ugen_osc.cpp
|
||||||
|
@@ -1232,7 +1232,7 @@ CK_DLL_CTRL( gen5_coeffs )
|
||||||
|
Chuck_Array8 * in_args = (Chuck_Array8 *)GET_CK_OBJECT(ARGS);
|
||||||
|
|
||||||
|
// fprintf(stdout, "calling gen10coeffs, %d\n", weights);
|
||||||
|
- if(in_args<0) return;
|
||||||
|
+ if(in_args!=0) return;
|
||||||
|
size = in_args->size();
|
||||||
|
if(size >= genX_MAX_COEFFS) size = genX_MAX_COEFFS - 1;
|
||||||
|
|
||||||
|
@@ -1287,7 +1287,7 @@ CK_DLL_CTRL( gen7_coeffs )
|
||||||
|
Chuck_Array8 * in_args = (Chuck_Array8 *)GET_CK_OBJECT(ARGS);
|
||||||
|
|
||||||
|
// fprintf(stdout, "calling gen10coeffs, %d\n", weights);
|
||||||
|
- if(in_args<0) return;
|
||||||
|
+ if(in_args!=0) return;
|
||||||
|
size = in_args->size();
|
||||||
|
if(size >= genX_MAX_COEFFS) size = genX_MAX_COEFFS - 1;
|
||||||
|
|
||||||
|
@@ -1340,7 +1340,7 @@ CK_DLL_CTRL( gen9_coeffs )
|
||||||
|
Chuck_Array8 * weights = (Chuck_Array8 *)GET_CK_OBJECT(ARGS);
|
||||||
|
|
||||||
|
// fprintf(stdout, "calling gen10coeffs, %d\n", weights);
|
||||||
|
- if(weights<0) return;
|
||||||
|
+ if(weights!=0) return;
|
||||||
|
size = weights->size();
|
||||||
|
if(size >= genX_MAX_COEFFS) size = genX_MAX_COEFFS - 1;
|
||||||
|
|
||||||
|
@@ -1390,7 +1390,7 @@ CK_DLL_CTRL( gen10_coeffs )
|
||||||
|
Chuck_Array8 * weights = (Chuck_Array8 *)GET_CK_OBJECT(ARGS);
|
||||||
|
|
||||||
|
// fprintf(stdout, "calling gen10coeffs, %d\n", weights);
|
||||||
|
- if(weights<0) return;
|
||||||
|
+ if(weights!=0) return;
|
||||||
|
size = weights->size();
|
||||||
|
if(size >= genX_MAX_COEFFS) size = genX_MAX_COEFFS - 1;
|
||||||
|
|
||||||
|
@@ -1441,7 +1441,7 @@ CK_DLL_CTRL( gen17_coeffs )
|
||||||
|
Chuck_Array8 * weights = (Chuck_Array8 *)GET_CK_OBJECT(ARGS);
|
||||||
|
|
||||||
|
// fprintf(stdout, "calling gen17coeffs, %d\n", weights);
|
||||||
|
- if(weights<0) return;
|
||||||
|
+ if(weights!=0) return;
|
||||||
|
size = weights->size();
|
||||||
|
if(size >= genX_MAX_COEFFS) size = genX_MAX_COEFFS - 1;
|
||||||
|
|
||||||
|
@@ -1502,7 +1502,7 @@ CK_DLL_CTRL( curve_coeffs )
|
||||||
|
Chuck_Array8 * weights = (Chuck_Array8 *)GET_CK_OBJECT(ARGS);
|
||||||
|
|
||||||
|
// fprintf(stdout, "calling gen17coeffs, %d\n", weights);
|
||||||
|
- if(weights<0) goto done;
|
||||||
|
+ if(weights!=0) goto done;
|
||||||
|
|
||||||
|
nargs = weights->size();
|
||||||
|
if (nargs < 5 || (nargs % 3) != 2) { // check number of args
|
@ -1,4 +1,6 @@
|
|||||||
{ stdenv, fetchurl, alsaLib, bison, flex, libsndfile, which }:
|
{ stdenv, fetchurl, alsaLib, bison, flex, libsndfile, which
|
||||||
|
, AppKit, Carbon, CoreAudio, CoreMIDI, CoreServices, Kernel
|
||||||
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "1.3.5.2";
|
version = "1.3.5.2";
|
||||||
@ -10,19 +12,24 @@ stdenv.mkDerivation rec {
|
|||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ bison flex libsndfile which ]
|
buildInputs = [ bison flex libsndfile which ]
|
||||||
++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
|
++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib
|
||||||
|
++ stdenv.lib.optional stdenv.isDarwin [ AppKit Carbon CoreAudio CoreMIDI CoreServices Kernel ];
|
||||||
|
|
||||||
patches = [ ./darwin-limits.patch ];
|
patches = [ ./clang.patch ./darwin-limits.patch ];
|
||||||
|
|
||||||
|
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-Wno-missing-sysroot";
|
||||||
|
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-framework MultitouchSupport";
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace src/makefile --replace "/usr/bin" "$out/bin"
|
substituteInPlace src/makefile --replace "/usr/bin" "$out/bin"
|
||||||
substituteInPlace src/makefile.osx --replace "xcodebuild" "/usr/bin/xcodebuild"
|
substituteInPlace src/makefile.osx --replace "xcodebuild" "/usr/bin/xcodebuild"
|
||||||
substituteInPlace src/makefile.osx --replace "weak_framework" "framework"
|
substituteInPlace src/makefile.osx --replace "weak_framework" "framework"
|
||||||
|
substituteInPlace src/makefile.osx --replace "MACOSX_DEPLOYMENT_TARGET=10.5" "MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
buildPhase =
|
buildPhase = ''
|
||||||
stdenv.lib.optionals stdenv.isLinux ["make -C src linux-alsa"] ++
|
make -C src ${if stdenv.isDarwin then "osx" else "linux-alsa"}
|
||||||
stdenv.lib.optionals stdenv.isDarwin ["make -C src osx"];
|
'';
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
install -Dm755 ./src/chuck $out/bin/chuck
|
install -Dm755 ./src/chuck $out/bin/chuck
|
||||||
|
@ -14868,7 +14868,9 @@ 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;
|
||||||
|
};
|
||||||
|
|
||||||
cinelerra = callPackage ../applications/video/cinelerra { };
|
cinelerra = callPackage ../applications/video/cinelerra { };
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user