diff options
| author | Matthias Beyer <mail@beyermatthias.de> | 2016-06-19 20:27:36 +0200 |
|---|---|---|
| committer | Matthias Beyer <mail@beyermatthias.de> | 2016-07-07 16:07:47 +0200 |
| commit | 7f4d52e27ec9ea9d06c3f992bfee96a9d7ae58d5 (patch) | |
| tree | e459dd607ccda5e91e9066a661fbc1cea685e234 /pkgs/development | |
| parent | a2ac3683ce9eb271a865f59a670e03d5ac236df9 (diff) | |
| download | nixlib-7f4d52e27ec9ea9d06c3f992bfee96a9d7ae58d5.tar nixlib-7f4d52e27ec9ea9d06c3f992bfee96a9d7ae58d5.tar.gz nixlib-7f4d52e27ec9ea9d06c3f992bfee96a9d7ae58d5.tar.bz2 nixlib-7f4d52e27ec9ea9d06c3f992bfee96a9d7ae58d5.tar.lz nixlib-7f4d52e27ec9ea9d06c3f992bfee96a9d7ae58d5.tar.xz nixlib-7f4d52e27ec9ea9d06c3f992bfee96a9d7ae58d5.tar.zst nixlib-7f4d52e27ec9ea9d06c3f992bfee96a9d7ae58d5.zip | |
Build libjack2 for supercollider with same GCC
Also remove trailing whitespace
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/interpreters/supercollider/default.nix | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index f44347c61b74..be85cd248154 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; } |