diff options
author | Silvan Mosberger <infinisil@icloud.com> | 2018-10-12 15:03:51 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-12 15:03:51 +0200 |
commit | c2129a850a311d984ea6aa602ea86e3bb127b289 (patch) | |
tree | 868dd54e8ec2003475459787b5d1e6b06f987fa1 /pkgs/development/libraries | |
parent | f3dd3b6afa18236fe878f0aad96e82245c09ebc2 (diff) | |
parent | 9affe6ca47746385cd106a551e3516665663bdfe (diff) | |
download | nixlib-c2129a850a311d984ea6aa602ea86e3bb127b289.tar nixlib-c2129a850a311d984ea6aa602ea86e3bb127b289.tar.gz nixlib-c2129a850a311d984ea6aa602ea86e3bb127b289.tar.bz2 nixlib-c2129a850a311d984ea6aa602ea86e3bb127b289.tar.lz nixlib-c2129a850a311d984ea6aa602ea86e3bb127b289.tar.xz nixlib-c2129a850a311d984ea6aa602ea86e3bb127b289.tar.zst nixlib-c2129a850a311d984ea6aa602ea86e3bb127b289.zip |
Merge pull request #48007 from magnetophon/kokkinizita
update Kokkinizita packages
Diffstat (limited to 'pkgs/development/libraries')
5 files changed, 34 insertions, 28 deletions
diff --git a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix b/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix index e3c0f0394772..320fc41f76c5 100644 --- a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix +++ b/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix @@ -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 = { diff --git a/pkgs/development/libraries/audio/zita-convolver/default.nix b/pkgs/development/libraries/audio/zita-convolver/default.nix index 11a06d4f39ac..4fc5c12ccc4c 100644 --- a/pkgs/development/libraries/audio/zita-convolver/default.nix +++ b/pkgs/development/libraries/audio/zita-convolver/default.nix @@ -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 ''; diff --git a/pkgs/development/libraries/audio/zita-resampler/default.nix b/pkgs/development/libraries/audio/zita-resampler/default.nix index 00a0a5082137..e9cccab39f02 100644 --- a/pkgs/development/libraries/audio/zita-resampler/default.nix +++ b/pkgs/development/libraries/audio/zita-resampler/default.nix @@ -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 ''; diff --git a/pkgs/development/libraries/libclthreads/default.nix b/pkgs/development/libraries/libclthreads/default.nix index 6d37eb19c712..a2f6858a05c9 100644 --- a/pkgs/development/libraries/libclthreads/default.nix +++ b/pkgs/development/libraries/libclthreads/default.nix @@ -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; { diff --git a/pkgs/development/libraries/libclxclient/default.nix b/pkgs/development/libraries/libclxclient/default.nix index ce67a8efa80e..6e6ca647fc0f 100644 --- a/pkgs/development/libraries/libclxclient/default.nix +++ b/pkgs/development/libraries/libclxclient/default.nix @@ -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 = [ |