summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJos van Bakel <josvanbakel@protonmail.com>2018-10-13 13:46:30 +0200
committerJos van Bakel <josvanbakel@protonmail.com>2018-10-13 19:40:54 +0200
commit2e31732bc4d66de470d46c50de9fe6fd35f274bc (patch)
tree7b4235556d3dc3a30febfe5f9621a1bbfe8c7c5c
parent4f3c13b84f1b762b27785b9dc68b4382eabc1c73 (diff)
sonic-pi: 3.0.1 -> 3.1.0
-rw-r--r--pkgs/applications/audio/sonic-pi/default.nix10
-rw-r--r--pkgs/development/interpreters/supercollider/default.nix2
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix
index d1c48ce44ed8..ee72b6cdb1a4 100644
--- a/pkgs/applications/audio/sonic-pi/default.nix
+++ b/pkgs/applications/audio/sonic-pi/default.nix
@@ -20,14 +20,14 @@ let
};
in stdenv.mkDerivation rec {
- version = "3.0.1";
+ version = "3.1.0";
name = "sonic-pi-${version}";
src = fetchFromGitHub {
owner = "samaaron";
repo = "sonic-pi";
rev = "v${version}";
- sha256 = "1l1892hijp1dj2h799sfjr699q6xp660n0siibab5kv238521a81";
+ sha256 = "0gi4a73szaa8iz5q1gxgpsnyvhhghcfqm6bfwwxbix4m5csbfgh9";
};
buildInputs = [
@@ -58,21 +58,21 @@ in stdenv.mkDerivation rec {
export SONIC_PI_HOME=$TMPDIR
export AUBIO_LIB=${aubio}/lib/libaubio.so
- pushd app/server/bin
+ pushd app/server/ruby/bin
./compile-extensions.rb
./i18n-tool.rb -t
popd
pushd app/gui/qt
cp -f ruby_help.tmpl ruby_help.h
- ../../server/bin/qt-doc.rb -o ruby_help.h
+ ../../server/ruby/bin/qt-doc.rb -o ruby_help.h
substituteInPlace SonicPi.pro \
--replace "LIBS += -lrt -lqt5scintilla2" \
"LIBS += -lrt -lqscintilla2 -lqwt"
lrelease SonicPi.pro
- qmake SonicPi.pro
+ qmake SonicPi.pro
make
popd
diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix
index 2737fd6fae04..7109ec68d3c8 100644
--- a/pkgs/development/interpreters/supercollider/default.nix
+++ b/pkgs/development/interpreters/supercollider/default.nix
@@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
description = "Programming language for real time audio synthesis";
homepage = http://supercollider.sourceforge.net/;
license = stdenv.lib.licenses.gpl3Plus;
- platforms = stdenv.lib.platforms.linux;
+ platforms = [ "x686-linux" "x86_64-linux" ];
};
}