diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-08-02 05:08:07 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-08-02 05:08:07 +0200 |
| commit | 6295a3ca36cc746e11c7b01fd47562fde3a703ec (patch) | |
| tree | 18d9289564e8893a9d7e4df671e5226bcd2b0f0c /pkgs/applications/audio/lmms | |
| parent | 91b53aaebc0ca2e80d073459324515879e300f34 (diff) | |
| parent | fb565f1a4ea2a71debe48e206ef6c2d032bba0a3 (diff) | |
| download | nixlib-6295a3ca36cc746e11c7b01fd47562fde3a703ec.tar nixlib-6295a3ca36cc746e11c7b01fd47562fde3a703ec.tar.gz nixlib-6295a3ca36cc746e11c7b01fd47562fde3a703ec.tar.bz2 nixlib-6295a3ca36cc746e11c7b01fd47562fde3a703ec.tar.lz nixlib-6295a3ca36cc746e11c7b01fd47562fde3a703ec.tar.xz nixlib-6295a3ca36cc746e11c7b01fd47562fde3a703ec.tar.zst nixlib-6295a3ca36cc746e11c7b01fd47562fde3a703ec.zip | |
Merge recent master into x-updates
Hydra: ?compare=1142825 Conflicts (easy): pkgs/applications/audio/lmms/default.nix pkgs/desktops/e18/enlightenment.nix pkgs/games/exult/default.nix pkgs/os-specific/linux/alsa-plugins/default.nix
Diffstat (limited to 'pkgs/applications/audio/lmms')
| -rw-r--r-- | pkgs/applications/audio/lmms/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix index 46d5017c4fe1..dd0649811bbb 100644 --- a/pkgs/applications/audio/lmms/default.nix +++ b/pkgs/applications/audio/lmms/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, alsaLib, cmake, fftwSinglePrec, jackaudio, libogg +{ stdenv, fetchurl, SDL, alsaLib, cmake, fftwSinglePrec, jack2, libogg , libsamplerate, libsndfile, pkgconfig, pulseaudio, qt4, freetype }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - SDL alsaLib cmake fftwSinglePrec jackaudio libogg libsamplerate + SDL alsaLib cmake fftwSinglePrec jack2 libogg libsamplerate libsndfile pkgconfig pulseaudio qt4 ]; |