Vladimír Čunát
6295a3ca36
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
2014-08-02 05:08:07 +02:00
Bjørn Forsman
62d0a320b3
Revert "Remove obsolete jackaudio version 1."
...
This reverts commit bdb77826d9http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
2014-07-31 12:52:29 +02:00
Peter Simons
bdb77826d9
Remove obsolete jackaudio version 1.
2014-07-28 20:32:52 +02:00
Bjørn Forsman
f6f2f38a6e
jack: change package and attr names to 'jack1' and 'jack2'
...
Currently, we have a 'jack' package with attrname 'jack1d' and a
'jackdbus' package with attrname 'jackaudio'. Make it consistent 'jack1'
and 'jack2' in both package name and attrname.
This aligns the naming with what can be found on the JACK homepage.
Q: what's the difference between jack1 and jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
2014-07-23 20:22:14 +02:00
Vladimír Čunát
4e39e578f2
lmms: fix build with freetype-2.5
2014-06-26 21:56:47 +02:00
Cillian de Róiste
c9d1ed561f
lmms: tidy up, fix build
2014-01-19 14:43:05 +01:00
Nixpkgs Monitor
f95dfe1502
lmms: update from 0.4.10 to 0.4.15
2014-01-19 14:43:05 +01:00
Cillian de Roiste
3cfe938b0e
Adding lmms: Linux MultiMedia Studio
...
svn path=/nixpkgs/trunk/; revision=26925
2011-04-22 23:00:55 +00:00
