diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-09-09 10:30:54 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-09 10:30:54 -0400 |
| commit | 259202cb8021b6cfeb6ddf49239daf1ea5aeb724 (patch) | |
| tree | 60ab1fb7e7315c146975816245120f5e31c1376b /pkgs/applications/audio | |
| parent | 667712abe435470d52f0b59542193fa33c37e976 (diff) | |
| parent | 24c55e2c9d4be35b778bfb08db7832756f2dc93b (diff) | |
| download | nixpkgs-259202cb8021b6cfeb6ddf49239daf1ea5aeb724.tar nixpkgs-259202cb8021b6cfeb6ddf49239daf1ea5aeb724.tar.gz nixpkgs-259202cb8021b6cfeb6ddf49239daf1ea5aeb724.tar.bz2 nixpkgs-259202cb8021b6cfeb6ddf49239daf1ea5aeb724.tar.lz nixpkgs-259202cb8021b6cfeb6ddf49239daf1ea5aeb724.tar.xz nixpkgs-259202cb8021b6cfeb6ddf49239daf1ea5aeb724.tar.zst nixpkgs-259202cb8021b6cfeb6ddf49239daf1ea5aeb724.zip | |
Merge pull request #68309 from c0deaddict/fix/sonic-pi-qt-wrapper
sonic-pi: fix qt wrapper
Diffstat (limited to 'pkgs/applications/audio')
| -rw-r--r-- | pkgs/applications/audio/sonic-pi/default.nix | 45 |
1 files changed, 25 insertions, 20 deletions
diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix index 7934af8aad8..2a39caa0865 100644 --- a/pkgs/applications/audio/sonic-pi/default.nix +++ b/pkgs/applications/audio/sonic-pi/default.nix @@ -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; }; } |