Tidy up #4283 and move freewheeling to APPLICATIONS

This commit is contained in:
Cillian de Róiste 2014-09-27 12:52:30 +02:00
parent 40ef936fb5
commit 5276adc1b4
2 changed files with 12 additions and 10 deletions

View File

@ -1,6 +1,7 @@
{ stdenv, fetchsvn, pkgconfig, autoconf, automake, gnutls, freetype,
SDL, SDL_gfx, SDL_ttf, liblo, libxml2, alsaLib, jack2, libvorbis,
libsndfile, libogg }:
{ stdenv, fetchsvn, pkgconfig, autoconf, automake, gnutls, freetype
, SDL, SDL_gfx, SDL_ttf, liblo, libxml2, alsaLib, jack2, libvorbis
, libsndfile, libogg
}:
stdenv.mkDerivation {
name = "freewheeling-100";
@ -11,16 +12,17 @@ stdenv.mkDerivation {
sha256 = "1m6z7p93xyha25qma9bazpzbp04pqdv5h3yrv6851775xsyvzksv";
};
buildInputs = [ pkgconfig autoconf automake gnutls freetype
SDL SDL_gfx SDL_ttf liblo libxml2 jack2 alsaLib
libvorbis libsndfile libogg ];
buildInputs = [
pkgconfig autoconf automake gnutls freetype SDL SDL_gfx SDL_ttf
liblo libxml2 jack2 alsaLib libvorbis libsndfile libogg
];
preConfigure = "autoreconf -vfi";
patches = [ ./am_path_sdl.patch ./xml.patch ];
meta = {
description = "A live looping instrument with jack and MIDI support";
description = "A live looping instrument with JACK and MIDI support";
longDescription = ''
Freewheeling allows us to build repetitive grooves
by sampling and directing loops from within spirited improvisation.

View File

@ -1147,8 +1147,6 @@ let
freetds = callPackage ../development/libraries/freetds { };
freewheeling = callPackage ../applications/audio/freewheeling { };
ftgl = callPackage ../development/libraries/ftgl { };
ftgl212 = callPackage ../development/libraries/ftgl/2.1.2.nix { };
@ -9039,6 +9037,8 @@ let
fossil = callPackage ../applications/version-management/fossil { };
freewheeling = callPackage ../applications/audio/freewheeling { };
fribid = callPackage ../applications/networking/browsers/mozilla-plugins/fribid { };
fvwm = callPackage ../applications/window-managers/fvwm { };