diff options
| author | Joachim Schiele <js@lastlog.de> | 2016-07-07 17:09:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-07 17:09:46 +0200 |
| commit | 9054f3f83eb4d461f57135a013a4d741ee66a065 (patch) | |
| tree | 07cebbcbf89db972c37a2d68150d282d2781ba41 /pkgs | |
| parent | 01c9933275b767532c6e1e2c44562f8676adb4bd (diff) | |
| parent | 7f4d52e27ec9ea9d06c3f992bfee96a9d7ae58d5 (diff) | |
| download | nixpkgs-9054f3f83eb4d461f57135a013a4d741ee66a065.tar nixpkgs-9054f3f83eb4d461f57135a013a4d741ee66a065.tar.gz nixpkgs-9054f3f83eb4d461f57135a013a4d741ee66a065.tar.bz2 nixpkgs-9054f3f83eb4d461f57135a013a4d741ee66a065.tar.lz nixpkgs-9054f3f83eb4d461f57135a013a4d741ee66a065.tar.xz nixpkgs-9054f3f83eb4d461f57135a013a4d741ee66a065.tar.zst nixpkgs-9054f3f83eb4d461f57135a013a4d741ee66a065.zip | |
Merge pull request #16344 from matthiasbeyer/fix-supercollider
Fix supercollider
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/interpreters/supercollider/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/misc/jackaudio/default.nix | 4 |
2 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index f44347c61b7..be85cd24815 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -3,10 +3,12 @@ , libXt, qt, readline , 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"; meta = { @@ -29,12 +31,12 @@ stdenv.mkDerivation rec { cmakeFlags = '' -DSC_WII=OFF - -DSC_EL=${if useSCEL then "ON" else "OFF"} + -DSC_EL=${if useSCEL then "ON" else "OFF"} ''; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ - gcc libjack2 libsndfile fftw curl libXt qt readline ] + buildInputs = [ + gcc ljack2 libsndfile fftw curl libXt qt readline ] ++ optional useSCEL emacs; } diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index b5748c0f832..66be12fbc43 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, python, makeWrapper -, bash, libsamplerate, libsndfile, readline +, bash, libsamplerate, libsndfile, readline, gcc # Optional Dependencies , dbus ? null, pythonDBus ? null, libffado ? null, alsaLib ? null @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig python makeWrapper ]; - buildInputs = [ + buildInputs = [ gcc python libsamplerate libsndfile readline |