public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Build libjack2 for supercollider with same GCC

Browse Source 
Also remove trailing whitespace
This commit is contained in:
Matthias Beyer 2016-06-19 20:27:36 +02:00
parent a2ac3683ce
commit 7f4d52e27e
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/interpreters/supercollider/default.nix
View File

@ -3,10 +3,12 @@
, libXt, qt, readline , libXt, qt, readline
, useSCEL ? false, emacs , useSCEL ? false, emacs
}: }:
let optional = stdenv.lib.optional; in
stdenv.mkDerivation rec { let optional = stdenv.lib.optional;
ljack2 = libjack2.override { gcc = gcc; };
in
stdenv.mkDerivation rec {
name = "supercollider-3.6.6"; name = "supercollider-3.6.6";
meta = { meta = {
@ -29,12 +31,12 @@ stdenv.mkDerivation rec {
cmakeFlags = '' cmakeFlags = ''
-DSC_WII=OFF -DSC_WII=OFF
-DSC_EL=${if useSCEL then "ON" else "OFF"} -DSC_EL=${if useSCEL then "ON" else "OFF"}
''; '';
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ buildInputs = [
gcc libjack2 libsndfile fftw curl libXt qt readline ] gcc ljack2 libsndfile fftw curl libXt qt readline ]
++ optional useSCEL emacs; ++ optional useSCEL emacs;
} }

4
pkgs/misc/jackaudio/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pkgconfig, python, makeWrapper { stdenv, fetchFromGitHub, pkgconfig, python, makeWrapper
, bash, libsamplerate, libsndfile, readline , bash, libsamplerate, libsndfile, readline, gcc
# Optional Dependencies # Optional Dependencies
, dbus ? null, pythonDBus ? null, libffado ? null, alsaLib ? null , dbus ? null, pythonDBus ? null, libffado ? null, alsaLib ? null
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig python makeWrapper ]; nativeBuildInputs = [ pkgconfig python makeWrapper ];
buildInputs = [ buildInputs = [ gcc
python python
libsamplerate libsndfile readline libsamplerate libsndfile readline