public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge recent master into x-updates

Browse Source 
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
This commit is contained in:
Vladimír Čunát
2014-08-02 05:08:07 +02:00
parent 91b53aaebc fb565f1a4e
commit 6295a3ca36
1391 changed files with 6647 additions and 5597 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/audio/lmms/default.nix
+2 -2
View File
@@ -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
];