supercollider: 3.6.6 -> 3.7.2 (#17395)

This commit is contained in:
Bart Brouns 2016-08-03 00:27:03 +02:00 committed by Franz Pletz
parent 0afcb79f60
commit 0621828bb7
2 changed files with 14 additions and 21 deletions

View file

@ -1,34 +1,22 @@
{ stdenv, fetchurl, cmake, pkgconfig
, libjack2, libsndfile, fftw, curl, gcc
, libXt, qt, readline
, libXt, qt55, readline
, useSCEL ? false, emacs
}:
let optional = stdenv.lib.optional;
ljack2 = libjack2.override { gcc = gcc; };
in
stdenv.mkDerivation rec {
name = "supercollider-3.6.6";
name = "supercollider-${version}";
version = "3.7.2";
meta = {
description = "Programming language for real time audio synthesis";
homepage = "http://supercollider.sourceforge.net/";
license = stdenv.lib.licenses.gpl3Plus;
platforms = stdenv.lib.platforms.linux;
};
src = fetchurl {
url = "mirror://sourceforge/supercollider/Source/3.6/SuperCollider-3.6.6-Source.tar.bz2";
sha256 = "11khrv6jchs0vv0lv43am8lp0x1rr3h6l2xj9dmwrxcpdayfbalr";
url = "https://github.com/supercollider/supercollider/releases/download/Version-${version}/SuperCollider-${version}-Source-linux.tar.bz2";
sha256 = "1mybxcnl7flliz74kdfnvh18v5dwd9zbdsw2kc7wpl4idcly1n0s";
};
# QGtkStyle unavailable
patchPhase = ''
substituteInPlace editors/sc-ide/widgets/code_editor/autocompleter.cpp \
--replace Q_WS_X11 Q_GTK_STYLE
'';
cmakeFlags = ''
-DSC_WII=OFF
-DSC_EL=${if useSCEL then "ON" else "OFF"}
@ -37,6 +25,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [
gcc ljack2 libsndfile fftw curl libXt qt readline ]
gcc libjack2 libsndfile fftw curl libXt qt55.qtwebkit qt55.qttools readline ]
++ optional useSCEL emacs;
meta = {
description = "Programming language for real time audio synthesis";
homepage = "http://supercollider.sourceforge.net/";
license = stdenv.lib.licenses.gpl3Plus;
platforms = stdenv.lib.platforms.linux;
};
}

View file

@ -5995,8 +5995,6 @@ in
spidermonkey_31 = callPackage ../development/interpreters/spidermonkey/31.5.nix { };
supercollider = callPackage ../development/interpreters/supercollider {
gcc = gcc48; # doesn't build with gcc49
qt = qt4;
fftw = fftwSinglePrec;
};
@ -15855,7 +15853,7 @@ in
};
solarus = callPackage ../games/solarus { };
solarus-quest-editor = qt5.callPackage ../development/tools/solarus-quest-editor { };
# You still can override by passing more arguments.