From 9857e8353bcc5f2b71088328ba53ec7bcafe364e Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Wed, 22 Apr 2015 16:28:37 +0200 Subject: [PATCH] jaaa: add desriptions, remove longdescriptions --- pkgs/applications/audio/jaaa/default.nix | 53 +++++++++++++++ .../libraries/libclthreads/default.nix | 26 ++++++++ .../libraries/libclxclient/default.nix | 38 +++++++++++ .../libraries/zita-alsa-pcmi/default.nix | 64 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 8 +++ 5 files changed, 189 insertions(+) create mode 100644 pkgs/applications/audio/jaaa/default.nix create mode 100644 pkgs/development/libraries/libclthreads/default.nix create mode 100644 pkgs/development/libraries/libclxclient/default.nix create mode 100644 pkgs/development/libraries/zita-alsa-pcmi/default.nix diff --git a/pkgs/applications/audio/jaaa/default.nix b/pkgs/applications/audio/jaaa/default.nix new file mode 100644 index 000000000000..b855bd296604 --- /dev/null +++ b/pkgs/applications/audio/jaaa/default.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchurl, alsaLib, libclthreads, libclxclient, libX11, libXft, libXrender, fftwFloat, freetype, fontconfig, jack2, xlibs, zita-alsa-pcmi }: + +stdenv.mkDerivation rec { + name = "jaaa-${version}"; + version = "0.8.4"; + + src = fetchurl { + url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + sha256 = "0jyll4rkb6vja2widc340ww078rr24c6nmxbxdqvbxw409nccd01"; + }; + + buildInputs = [ + alsaLib libclthreads libclxclient libX11 libXft libXrender fftwFloat jack2 zita-alsa-pcmi + ]; + + NIX_CFLAGS_COMPILE = [ + "-I${xlibs.xproto}/include" + "-I${libX11}/include" + "-I${libXft}/include" + "-I${freetype}/include" + "-I${fontconfig}/include" + "-I${libXrender}/include" + "-I${xlibs.renderproto}/include" + "-I${alsaLib}/include" + "-I${zita-alsa-pcmi}/include" + ]; + + patchPhase = '' + cd source/ + sed -i "s@clthreads.h@${libclthreads}/include@g" $(find . -name '*.cc') + sed -i "s@clxclient.h@${libclxclient}/include@g" $(find . -name '*.cc') + sed -i "s@clthreads.h@${libclthreads}/include@g" $(find . -name '*.h') + sed -i "s@clxclient.h@${libclxclient}/include@g" $(find . -name '*.h') + ''; + + buildlPhase = '' + make PREFIX="$out" + ''; + + installPhase = '' + echo zita= ${zita-alsa-pcmi} + make PREFIX="$out" install + install -Dm644 ../README "$out/README" + ''; + + meta = with stdenv.lib; { + homepage = http://kokkinizita.linuxaudio.org/linuxaudio/index.html; + description = "JACK and ALSA Audio Analyser"; + license = licenses.gpl2; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libclthreads/default.nix b/pkgs/development/libraries/libclthreads/default.nix new file mode 100644 index 000000000000..5d5a9e49381f --- /dev/null +++ b/pkgs/development/libraries/libclthreads/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, }: + +stdenv.mkDerivation rec { + name = "libclthreads-${version}"; + version = "2.4.0"; + src = fetchurl { + url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/clthreads-${version}.tar.bz2"; + sha256 = "1s8xx99z6llv46cvkllmd72v2pkzbfl5gngcql85mf14mxkdb7x6"; + }; + + configurePhase = '' + sed -e "s@/usr/local@$out@" -i Makefile + sed -e "s@/usr/bin/install@install@" -i Makefile + sed -e "s@/sbin/ldconfig@ldconfig@" -i Makefile + sed -e "s@SUFFIX :=.*@SUFFIX =@" -i Makefile + ''; + + meta = { + description = "zita thread library"; + version = "${version}"; + homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html"; + license = stdenv.lib.licenses.lgpl21; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libclxclient/default.nix b/pkgs/development/libraries/libclxclient/default.nix new file mode 100644 index 000000000000..7d0e4596dd0b --- /dev/null +++ b/pkgs/development/libraries/libclxclient/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, libclthreads, libXft, libX11, xlibs }: + +stdenv.mkDerivation rec { + name = "libclxclient-${version}"; + version = "3.9.0"; + src = fetchurl { + url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/clxclient-${version}.tar.bz2"; + sha256 = "14l7xrh964gllymraq4n5pgax94p5jsfjslqi5c6637zc4lmgnl0"; + }; + + buildInputs = [ + libclthreads libXft libX11 xlibs.xproto + ]; + + configurePhase = '' + cpp -v + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${xlibs.xproto}/include" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libXft}/include" + echo $NIX_CFLAGS_COMPILE + sed -e "s@/usr/local@$out@" -i Makefile + sed -e "s@#include @#include <${libclthreads}/include>@" -i clxclient.h + sed -e "s@ldconfig@@" -i Makefile + sed -e "s@SUFFIX :=.*@SUFFIX =@" -i Makefile + ''; + + fixupPhase = '' + ln $out/lib/libclxclient.so $out/lib/libclxclient.so.3 + ''; + + meta = { + description = "zita X11 library"; + version = "${version}"; + homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html"; + license = stdenv.lib.licenses.lgpl21; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/zita-alsa-pcmi/default.nix b/pkgs/development/libraries/zita-alsa-pcmi/default.nix new file mode 100644 index 000000000000..2f5b9183f66f --- /dev/null +++ b/pkgs/development/libraries/zita-alsa-pcmi/default.nix @@ -0,0 +1,64 @@ +{ stdenv, fetchurl , alsaLib, }: + +stdenv.mkDerivation rec { + name = "zita-alsa-pcmi-${version}"; + version = "0.2.0"; + src = fetchurl { + url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + sha256 = "1rgv332g82rrrlm4vdam6p2pyrisxbi7b3izfaa0pcjglafsy7j9"; + }; + + buildInputs = [ alsaLib ]; + + buildPhase = '' + cd libs + make PREFIX="$out" + + # create lib link for building apps + ln -s libzita-alsa-pcmi.so.$version libzita-alsa-pcmi.so + + # apps + cd ../apps + CXXFLAGS+=" -I../libs" \ + LDFLAGS+=" -L../libs" \ + make PREFIX="$out" + ''; + + installPhase = '' + mkdir "$out" + mkdir "$out/lib" + mkdir "$out/include" + mkdir "$out/bin" + + cd ../libs + + # libs + install -Dm755 libzita-alsa-pcmi.so.$version \ + "$out/lib/libzita-alsa-pcmi.so.$version" + + # link + ln -s libzita-alsa-pcmi.so.$version \ + "$out/lib/libzita-alsa-pcmi.so" + ln -s libzita-alsa-pcmi.so.$version \ + "$out/lib/libzita-alsa-pcmi.so.0" + + # header + install -Dm644 zita-alsa-pcmi.h \ + "$out/include/zita-alsa-pcmi.h" + + # apps + install -Dm755 ../apps/alsa_delay \ + "$out/bin/alsa_delay" + install -Dm755 ../apps/alsa_loopback \ + "$out/bin/alsa_delay" + ''; + + meta = { + description = "The successor of clalsadrv, provides easy access to ALSA PCM devices"; + version = "${version}"; + homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html"; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bfb8bfde67e9..ac22264a2748 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1738,6 +1738,8 @@ let isync = callPackage ../tools/networking/isync { }; + jaaa = callPackage ../applications/audio/jaaa { }; + jd-gui = callPackage_i686 ../tools/security/jd-gui { }; jdiskreport = callPackage ../tools/misc/jdiskreport { }; @@ -6314,6 +6316,10 @@ let libcli = callPackage ../development/libraries/libcli { }; + libclthreads = callPackage ../development/libraries/libclthreads { }; + + libclxclient = callPackage ../development/libraries/libclxclient { }; + libcm = callPackage ../development/libraries/libcm { }; inherit (gnome3) libcroco; @@ -7912,6 +7918,8 @@ let czmq = callPackage ../development/libraries/czmq { }; + zita-alsa-pcmi = callPackage ../development/libraries/zita-alsa-pcmi { }; + zziplib = callPackage ../development/libraries/zziplib { }; ### DEVELOPMENT / LIBRARIES / AGDA