diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-28 11:30:31 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-28 11:30:49 +0200 |
| commit | f64d84698eb3f4d833e846336ff99a73331c31f7 (patch) | |
| tree | 1120886b680851bc8b8f8d337af3503ecd4a3d71 /pkgs/applications/audio/projectm/default.nix | |
| parent | 3e4a382d6753a057256c7ef1e9f52ae9e07bd677 (diff) | |
| parent | 30431e71608576baf880567b2894ad2a542f8d5e (diff) | |
| download | nixlib-f64d84698eb3f4d833e846336ff99a73331c31f7.tar nixlib-f64d84698eb3f4d833e846336ff99a73331c31f7.tar.gz nixlib-f64d84698eb3f4d833e846336ff99a73331c31f7.tar.bz2 nixlib-f64d84698eb3f4d833e846336ff99a73331c31f7.tar.lz nixlib-f64d84698eb3f4d833e846336ff99a73331c31f7.tar.xz nixlib-f64d84698eb3f4d833e846336ff99a73331c31f7.tar.zst nixlib-f64d84698eb3f4d833e846336ff99a73331c31f7.zip | |
Merge remote-tracking branch 'origin/master' into staging
Conflicts: pkgs/applications/audio/espeak/edit.nix 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/projectm/default.nix')
| -rw-r--r-- | pkgs/applications/audio/projectm/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/audio/projectm/default.nix b/pkgs/applications/audio/projectm/default.nix index 2dd251ddd5bd..508b6743cc39 100644 --- a/pkgs/applications/audio/projectm/default.nix +++ b/pkgs/applications/audio/projectm/default.nix @@ -2,7 +2,7 @@ , glew, ftgl, ttf_bitstream_vera , withQt ? true, qt4 , withLibvisual ? false, libvisual, SDL -, withJack ? false, jackaudio +, withJack ? false, jack2 , withPulseAudio ? true, pulseaudio }: @@ -45,7 +45,7 @@ stdenv.mkDerivation { [ glew ftgl ] ++ optional withQt qt4 ++ optionals withLibvisual [ libvisual SDL ] - ++ optional withJack jackaudio + ++ optional withJack jack2 ++ optional withPulseAudio pulseaudio ; } |