Merge pull request #68309 from c0deaddict/fix/sonic-pi-qt-wrapper

sonic-pi: fix qt wrapper
This commit is contained in:
worldofpeace 2019-09-09 10:30:54 -04:00 committed by GitHub
commit 259202cb80
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 21 deletions

View file

@ -1,4 +1,6 @@
{ stdenv
{ mkDerivation
, lib
, qtbase
, fetchFromGitHub
, fftwSinglePrec
, ruby
@ -6,20 +8,21 @@
, aubio
, cmake
, pkgconfig
, qt5
, libsForQt5
, boost
, bash
, makeWrapper
, jack2Full
, supercollider
, qscintilla
, qwt
}:
let
supercollider = libsForQt5.callPackage ../../../development/interpreters/supercollider {
fftw = fftwSinglePrec;
};
in stdenv.mkDerivation rec {
supercollider_single_prec = supercollider.override { fftw = fftwSinglePrec; };
in
mkDerivation rec {
version = "3.1.0";
pname = "sonic-pi";
@ -33,15 +36,14 @@ in stdenv.mkDerivation rec {
buildInputs = [
bash
cmake
makeWrapper
pkgconfig
qt5.qtbase
libsForQt5.qscintilla
libsForQt5.qwt
qtbase
qscintilla
qwt
ruby
libffi
aubio
supercollider
supercollider_single_prec
boost
];
@ -80,20 +82,23 @@ in stdenv.mkDerivation rec {
installPhase = ''
runHook preInstall
cp -r . $out
wrapProgram $out/bin/sonic-pi \
runHook postInstall
'';
# $out/bin/sonic-pi is a shell script, and wrapQtAppsHook doesn't wrap them.
dontWrapQtApps = true;
preFixup = ''
wrapQtApp "$out/bin/sonic-pi" \
--prefix PATH : ${ruby}/bin:${bash}/bin:${supercollider}/bin:${jack2Full}/bin \
--set AUBIO_LIB "${aubio}/lib/libaubio.so"
runHook postInstall
'';
meta = {
homepage = http://sonic-pi.net/;
description = "Free live coding synth for everyone originally designed to support computing and music lessons within schools";
license = stdenv.lib.licenses.mit;
maintainers = with stdenv.lib.maintainers; [ Phlogistique kamilchm ];
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ Phlogistique kamilchm ];
platforms = lib.platforms.linux;
};
}

View file

@ -20431,7 +20431,7 @@ in
wavebox = callPackage ../applications/networking/instant-messengers/wavebox { };
sonic-pi = callPackage ../applications/audio/sonic-pi { };
sonic-pi = libsForQt5.callPackage ../applications/audio/sonic-pi { };
st = callPackage ../applications/misc/st {
conf = config.st.conf or null;