Merge pull request #48007 from magnetophon/kokkinizita

update Kokkinizita packages
This commit is contained in:
Silvan Mosberger 2018-10-12 15:03:51 +02:00 committed by GitHub
commit c2129a850a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 38 additions and 32 deletions

View File

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "aeolus-${version}";
version = "0.9.5";
version = "0.9.7";
src = fetchurl {
url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
sha256 = "0wfp8ihldyq2dhdyy7ld7z0zzfvnwam1dvbxnpd9d6xgc4k3j4nv";
sha256 = "0lhbr95hmbfj8ynbcpawn7jzjbpvrkm6k2yda39yhqk1bzg38v2k";
};
buildInputs = [

View File

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "tetraproc-${version}";
version = "0.8.2";
version = "0.8.6";
src = fetchurl {
url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
sha256 = "17y3vbm5f6h5cmh3yfxjgqz4xhfwpkla3lqfspnbm4ndlzmfpykv";
sha256 = "02155ljfwgvfgq9z258fb4z7jrz7qx022d054fj5gr0v007cv0r7";
};
nativeBuildInputs = [ makeWrapper ];

View File

@ -2,16 +2,16 @@
stdenv.mkDerivation rec {
name = "zita-alsa-pcmi-${version}";
version = "0.2.0";
version = "0.3.2";
src = fetchurl {
url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
sha256 = "1rgv332g82rrrlm4vdam6p2pyrisxbi7b3izfaa0pcjglafsy7j9";
sha256 = "12d7vdg74yh21w69qi0wg57iz4876j94qbiq09bvscih6xz9y78s";
};
buildInputs = [ alsaLib ];
buildPhase = ''
cd libs
cd source
make PREFIX="$out"
# create lib link for building apps
@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
# apps
cd ../apps
CXXFLAGS+=" -I../libs" \
LDFLAGS+=" -L../libs" \
CXXFLAGS+=" -I../source" \
LDFLAGS+=" -L../source" \
make PREFIX="$out"
'';
@ -30,9 +30,9 @@ stdenv.mkDerivation rec {
mkdir "$out/include"
mkdir "$out/bin"
cd ../libs
cd ../source
# libs
# source
install -Dm755 libzita-alsa-pcmi.so.$version \
"$out/lib/libzita-alsa-pcmi.so.$version"
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
install -Dm755 ../apps/alsa_delay \
"$out/bin/alsa_delay"
install -Dm755 ../apps/alsa_loopback \
"$out/bin/alsa_delay"
"$out/bin/alsa_loopback"
'';
meta = {

View File

@ -2,16 +2,16 @@
stdenv.mkDerivation rec {
name = "zita-convolver-${version}";
version = "4.0.0";
version = "4.0.3";
src = fetchurl {
url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
sha256 = "0fx7f48ls0rlndqrmd4k7ifpnml39yxzc2f0n6xyysypgn06y673";
sha256 = "0prji66p86z2bzminywkwchr5bfgxcg2i8y803pydd1hzf2198cs";
};
buildInputs = [ fftwFloat ];
patchPhase = ''
cd libs
cd source
sed -e "s@ldconfig@@" -i Makefile
'';

View File

@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
name = "zita-resampler-${version}";
version = "1.6.0";
version = "1.6.2";
src = fetchurl {
url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
sha256 = "1w48lp99jn4wh687cvbnbnjgaraqzkb4bgir16cp504x55v8v20h";
sha256 = "1my5k2dh2dkvjp6xjnf9qy6i7s28z13kw1n9pwa4a2cpwbzawfr3";
};
makeFlags = [
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
];
patchPhase = ''
cd libs
cd source
sed -e "s@ldconfig@@" -i Makefile
'';

View File

@ -2,20 +2,17 @@
stdenv.mkDerivation rec {
name = "libclthreads-${version}";
version = "2.4.0";
version = "2.4.2";
src = fetchurl {
url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/clthreads-${version}.tar.bz2";
sha256 = "1s8xx99z6llv46cvkllmd72v2pkzbfl5gngcql85mf14mxkdb7x6";
sha256 = "0cbs1w89q8wfjrrhvxf6xk0y02nkjl5hd0yb692c8ma01i6b2nf6";
};
patchPhase = ''
# Fix hardcoded paths to executables
sed -e "s@/usr/bin/install@install@" -i ./Makefile
sed -e "s@/sbin/ldconfig@ldconfig@" -i ./Makefile
# Remove useless symlink: /lib64 -> /lib
sed -e '/ln -sf \$(CLTHREADS_MIN) \$(PREFIX)\/\$(LIBDIR)\/\$(CLTHREADS_SO)/d' -i ./Makefile
cd source
# don't run ldconfig:
sed -e "/ldconfig/d" -i ./Makefile
'';
makeFlags = [
@ -24,12 +21,13 @@ stdenv.mkDerivation rec {
];
preInstall = ''
# The Makefile does not create the include directory
# The Makefile does not create the include and lib directories
mkdir -p $out/include
mkdir -p $out/lib
'';
postInstall = ''
ln -s $out/lib/libclthreads.so.${version} $out/lib/libclthreads.so
ln $out/lib/libclthreads.so $out/lib/libclthreads.so.2
'';
meta = with stdenv.lib; {

View File

@ -1,20 +1,28 @@
{ stdenv, fetchurl, libclthreads, libX11, libXft, xorg }:
{ stdenv, fetchurl, libclthreads, libX11, libXft, xorg, pkgconfig }:
stdenv.mkDerivation rec {
name = "libclxclient-${version}";
version = "3.9.0";
version = "3.9.2";
src = fetchurl {
url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/clxclient-${version}.tar.bz2";
sha256 = "14l7xrh964gllymraq4n5pgax94p5jsfjslqi5c6637zc4lmgnl0";
sha256 = "10bq6fy8d3pr1x2x3xx9qhf2hdxrwdgvg843a2y6lx70y1jfj0c5";
};
buildInputs = [ libclthreads libX11 libXft xorg.xproto ];
nativeBuildInputs = [ pkgconfig ];
NIX_CFLAGS_COMPILE = "-I${xorg.xproto}/include -I${libXft.dev}/include";
patchPhase = ''
sed -e "s@ldconfig@@" -i Makefile
cd source
# use pkg-config instead of pkgcon:
sed -e 's/pkgconf/pkg-config/g' -i ./Makefile
# don't run ldconfig:
sed -e "/ldconfig/d" -i ./Makefile
# make sure it can find clxclient.h:
sed -e 's/<clxclient.h>/"clxclient.h"/' -i ./enumip.cc
'';
makeFlags = [