diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-08-03 11:25:10 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-08-03 11:29:01 +0200 |
| commit | 1b169722a3d09209835f96a14cb3feace2548220 (patch) | |
| tree | 02f330e1dbab79ef1132099806d15ce1a8cf2c23 /pkgs/applications/audio | |
| parent | 7a4a1320859b3e4ba302b36b005b4aec1977dbc1 (diff) | |
| parent | 6295a3ca36cc746e11c7b01fd47562fde3a703ec (diff) | |
| download | nixlib-1b169722a3d09209835f96a14cb3feace2548220.tar nixlib-1b169722a3d09209835f96a14cb3feace2548220.tar.gz nixlib-1b169722a3d09209835f96a14cb3feace2548220.tar.bz2 nixlib-1b169722a3d09209835f96a14cb3feace2548220.tar.lz nixlib-1b169722a3d09209835f96a14cb3feace2548220.tar.xz nixlib-1b169722a3d09209835f96a14cb3feace2548220.tar.zst nixlib-1b169722a3d09209835f96a14cb3feace2548220.zip | |
Merge branch 'x-updates'
Close #3147. The only major update is freetype-2.5, I think (it cost lots of work).
Diffstat (limited to 'pkgs/applications/audio')
| -rw-r--r-- | pkgs/applications/audio/lmms/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix index 540777473d41..dd0649811bbb 100644 --- a/pkgs/applications/audio/lmms/default.nix +++ b/pkgs/applications/audio/lmms/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, SDL, alsaLib, cmake, fftwSinglePrec, jack2, libogg -, libsamplerate, libsndfile, pkgconfig, pulseaudio, qt4 +, libsamplerate, libsndfile, pkgconfig, pulseaudio, qt4, freetype }: stdenv.mkDerivation rec { @@ -16,6 +16,11 @@ stdenv.mkDerivation rec { libsndfile pkgconfig pulseaudio qt4 ]; + # work around broken build system of 0.4.* + NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2"; + + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Linux MultiMedia Studio"; homepage = "http://lmms.sourceforge.net"; |