diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-01 09:42:54 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-01 09:42:54 +0200 |
| commit | 55e4555b77ff7506579c1d4f5d9b562ca6e853b4 (patch) | |
| tree | adbc42e629ea3441456eb5e5e4e0b3a7fa2d867a /pkgs/applications/audio/chuck/default.nix | |
| parent | f498a8b7af41401c167baa6879a8b0271e8ffbf5 (diff) | |
| parent | ff13b6f1acceac062e66a2b0f39a59bcb5570a87 (diff) | |
| download | nixpkgs-55e4555b77ff7506579c1d4f5d9b562ca6e853b4.tar nixpkgs-55e4555b77ff7506579c1d4f5d9b562ca6e853b4.tar.gz nixpkgs-55e4555b77ff7506579c1d4f5d9b562ca6e853b4.tar.bz2 nixpkgs-55e4555b77ff7506579c1d4f5d9b562ca6e853b4.tar.lz nixpkgs-55e4555b77ff7506579c1d4f5d9b562ca6e853b4.tar.xz nixpkgs-55e4555b77ff7506579c1d4f5d9b562ca6e853b4.tar.zst nixpkgs-55e4555b77ff7506579c1d4f5d9b562ca6e853b4.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/audio/chuck/default.nix')
| -rw-r--r-- | pkgs/applications/audio/chuck/default.nix | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/applications/audio/chuck/default.nix b/pkgs/applications/audio/chuck/default.nix index 6113a776a67..da26a718835 100644 --- a/pkgs/applications/audio/chuck/default.nix +++ b/pkgs/applications/audio/chuck/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "1.3.5.2"; + version = "1.4.0.0"; name = "chuck-${version}"; src = fetchurl { url = "http://chuck.cs.princeton.edu/release/files/chuck-${version}.tgz"; - sha256 = "02z7sglax3j09grj5s1skmw8z6wz7b21hjrm95nrrdpwbxabh079"; + sha256 = "1b17rsf7bv45gfhyhfmpz9d4rkxn24c0m2hgmpfjz3nlp0rf7bic"; }; nativeBuildInputs = [ flex bison which ]; @@ -17,16 +17,15 @@ stdenv.mkDerivation rec { ++ lib.optional (!stdenv.isDarwin) alsaLib ++ lib.optional stdenv.isDarwin [ AppKit Carbon CoreAudio CoreMIDI CoreServices Kernel ]; - patches = [ ./clang.patch ./darwin-limits.patch ]; + patches = [ ./darwin-limits.patch ]; NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin "-Wno-missing-sysroot"; NIX_LDFLAGS = lib.optional stdenv.isDarwin "-framework MultitouchSupport"; postPatch = '' - substituteInPlace src/makefile --replace "/usr/bin" "$out/bin" - substituteInPlace src/makefile.osx \ + substituteInPlace src/core/makefile.x/makefile.osx \ --replace "weak_framework" "framework" \ - --replace "MACOSX_DEPLOYMENT_TARGET=10.5" "MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET" + --replace "MACOSX_DEPLOYMENT_TARGET=10.9" "MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET" ''; makeFlags = [ "-C src" "DESTDIR=$(out)/bin" ]; @@ -36,7 +35,7 @@ stdenv.mkDerivation rec { description = "Programming language for real-time sound synthesis and music creation"; homepage = http://chuck.cs.princeton.edu; license = licenses.gpl2; - platforms = with platforms; linux ++ darwin; + platforms = platforms.unix; maintainers = with maintainers; [ ftrvxmtrx ]; }; } |