Tidy up #4283 and move freewheeling to APPLICATIONS

+12 -10
+10 -8
pkgs/applications/audio/freewheeling/default.nix
··· 1 - { stdenv, fetchsvn, pkgconfig, autoconf, automake, gnutls, freetype, 2 - SDL, SDL_gfx, SDL_ttf, liblo, libxml2, alsaLib, jack2, libvorbis, 3 - libsndfile, libogg }: 1 + { stdenv, fetchsvn, pkgconfig, autoconf, automake, gnutls, freetype 2 + , SDL, SDL_gfx, SDL_ttf, liblo, libxml2, alsaLib, jack2, libvorbis 3 + , libsndfile, libogg 4 + }: 4 5 5 6 stdenv.mkDerivation { 6 7 name = "freewheeling-100"; ··· 11 12 sha256 = "1m6z7p93xyha25qma9bazpzbp04pqdv5h3yrv6851775xsyvzksv"; 12 13 }; 13 14 14 - buildInputs = [ pkgconfig autoconf automake gnutls freetype 15 - SDL SDL_gfx SDL_ttf liblo libxml2 jack2 alsaLib 16 - libvorbis libsndfile libogg ]; 15 + buildInputs = [ 16 + pkgconfig autoconf automake gnutls freetype SDL SDL_gfx SDL_ttf 17 + liblo libxml2 jack2 alsaLib libvorbis libsndfile libogg 18 + ]; 17 19 18 20 preConfigure = "autoreconf -vfi"; 19 21 20 22 patches = [ ./am_path_sdl.patch ./xml.patch ]; 21 - 23 + 22 24 meta = { 23 - description = "A live looping instrument with jack and MIDI support"; 25 + description = "A live looping instrument with JACK and MIDI support"; 24 26 longDescription = '' 25 27 Freewheeling allows us to build repetitive grooves 26 28 by sampling and directing loops from within spirited improvisation.
+2 -2
pkgs/top-level/all-packages.nix
··· 1147 1147 1148 1148 freetds = callPackage ../development/libraries/freetds { }; 1149 1149 1150 - freewheeling = callPackage ../applications/audio/freewheeling { }; 1151 - 1152 1150 ftgl = callPackage ../development/libraries/ftgl { }; 1153 1151 1154 1152 ftgl212 = callPackage ../development/libraries/ftgl/2.1.2.nix { }; ··· 9038 9036 fluidsynth = callPackage ../applications/audio/fluidsynth { }; 9039 9037 9040 9038 fossil = callPackage ../applications/version-management/fossil { }; 9039 + 9040 + freewheeling = callPackage ../applications/audio/freewheeling { }; 9041 9041 9042 9042 fribid = callPackage ../applications/networking/browsers/mozilla-plugins/fribid { }; 9043 9043