diff options
| author | Timo Kaufmann <timokau@zoho.com> | 2018-10-17 00:02:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-17 00:02:01 +0200 |
| commit | 192dde6411d5f26692cf20456e813b084e2ab5b0 (patch) | |
| tree | ab9c45da8f62177cc6da463e360f279281385431 /pkgs | |
| parent | 043ed2ee6b172ae15f23fced1d99cc58d703044b (diff) | |
| parent | 2e31732bc4d66de470d46c50de9fe6fd35f274bc (diff) | |
| download | nixlib-192dde6411d5f26692cf20456e813b084e2ab5b0.tar nixlib-192dde6411d5f26692cf20456e813b084e2ab5b0.tar.gz nixlib-192dde6411d5f26692cf20456e813b084e2ab5b0.tar.bz2 nixlib-192dde6411d5f26692cf20456e813b084e2ab5b0.tar.lz nixlib-192dde6411d5f26692cf20456e813b084e2ab5b0.tar.xz nixlib-192dde6411d5f26692cf20456e813b084e2ab5b0.tar.zst nixlib-192dde6411d5f26692cf20456e813b084e2ab5b0.zip | |
Merge pull request #48314 from c0deaddict/master
sonic-pi: 3.0.1 -> 3.1.0
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/audio/sonic-pi/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/interpreters/supercollider/default.nix | 2 |
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" ]; }; } |