From 5276adc1b4db94c1781fe5d6e4dbd4a3c5777220 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 27 Sep 2014 12:52:30 +0200 Subject: [PATCH] Tidy up #4283 and move freewheeling to APPLICATIONS --- .../audio/freewheeling/default.nix | 18 ++++++++++-------- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix index d682899e9de9..a3f356e75c45 100644 --- a/pkgs/applications/audio/freewheeling/default.nix +++ b/pkgs/applications/audio/freewheeling/default.nix @@ -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. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1cfcf3f34bab..5d26eb2950d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };