ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 04:43:09 +03:00
Code Issues Projects Releases Wiki Activity

supercollider: pin to Qt 5.6

Browse Source
This commit is contained in:
Thomas Tuegel 2017-03-24 15:00:03 -05:00
parent a90fd50bdc
commit f87d3d6f80
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
{ stdenv, fetchurl, cmake, pkgconfig { stdenv, fetchurl, cmake, pkgconfig
, libjack2, libsndfile, fftw, curl, gcc , libjack2, libsndfile, fftw, curl, gcc
, libXt, qt55, readline , libXt, qtbase, qttools, qtwebkit, readline
, useSCEL ? false, emacs , useSCEL ? false, emacs
}: }:
@ -24,10 +24,10 @@ stdenv.mkDerivation rec {
-DSC_EL=${if useSCEL then "ON" else "OFF"} -DSC_EL=${if useSCEL then "ON" else "OFF"}
''; '';
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig qttools ];
buildInputs = [ buildInputs = [
gcc libjack2 libsndfile fftw curl libXt qt55.qtwebkit qt55.qttools readline ] gcc libjack2 libsndfile fftw curl libXt qtbase qtwebkit readline ]
++ optional useSCEL emacs; ++ optional useSCEL emacs;
meta = { meta = {

2
pkgs/top-level/all-packages.nix
View File

@ -6112,7 +6112,7 @@ with pkgs;
ssm-agent = callPackage ../applications/networking/cluster/ssm-agent { }; ssm-agent = callPackage ../applications/networking/cluster/ssm-agent { };
supercollider = callPackage ../development/interpreters/supercollider { supercollider = libsForQt56.callPackage ../development/interpreters/supercollider {
fftw = fftwSinglePrec; fftw = fftwSinglePrec;
}; };