diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-17 13:10:05 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-17 13:10:05 +0000 |
commit | ed8caa2c7fbf063a437813cac5cc4c3b40fa23cc (patch) | |
tree | 664d67ec6f758216bce440ce9d9035851b6585aa /pkgs/development | |
parent | ee75764bdb3c5ab5cee81ec5f307adac357c01b5 (diff) | |
download | nixlib-ed8caa2c7fbf063a437813cac5cc4c3b40fa23cc.tar nixlib-ed8caa2c7fbf063a437813cac5cc4c3b40fa23cc.tar.gz nixlib-ed8caa2c7fbf063a437813cac5cc4c3b40fa23cc.tar.bz2 nixlib-ed8caa2c7fbf063a437813cac5cc4c3b40fa23cc.tar.lz nixlib-ed8caa2c7fbf063a437813cac5cc4c3b40fa23cc.tar.xz nixlib-ed8caa2c7fbf063a437813cac5cc4c3b40fa23cc.tar.zst nixlib-ed8caa2c7fbf063a437813cac5cc4c3b40fa23cc.zip |
svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=32347
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/libraries/mediastreamer/default.nix | 10 | ||||
-rw-r--r-- | pkgs/development/libraries/vigra/default.nix | 14 | ||||
-rw-r--r-- | pkgs/development/tools/misc/coccinelle/default.nix | 4 |
3 files changed, 17 insertions, 11 deletions
diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index bef82e5085cc..3d5dff53ff4e 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchurl, pkgconfig, alsaLib, ffmpeg, speex, ortp, pulseaudio, xorg, - libv4l, libtheora }: + libv4l, libtheora, intltool, libvpx, gsm }: stdenv.mkDerivation rec { - name = "mediastreamer-2.7.2"; + name = "mediastreamer-2.8.0"; src = fetchurl { url = "mirror://savannah/linphone/mediastreamer/${name}.tar.gz"; - sha256 = "1w5j5shzd5f7q3l2gm4cl82f3vnrdzp78lcyjbjb416c4vzw2nr2"; + sha256 = "0h1qda2mjc76xirldlvpmzf57vcbgr113a9b0kw1xm5i58s0w34f"; }; # TODO: make it load plugins from *_PLUGIN_PATH - buildNativeInputs = [pkgconfig]; + buildNativeInputs = [pkgconfig intltool]; propagatedBuildInputs = [alsaLib ffmpeg speex ortp pulseaudio xorg.libX11 - xorg.libXv xorg.libXext libv4l libtheora]; + xorg.libXv xorg.libXext libv4l libtheora libvpx gsm ]; #patches = [ ./h264.patch ./plugins.patch ]; diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index 5b3b119cb1d0..93ed2869d0e9 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -1,13 +1,15 @@ -{ stdenv, fetchurl, cmake, libtiff, libpng, libjpeg, doxygen, python, fftw }: -stdenv.mkDerivation { - name = "vigra-1.7.0"; +{ stdenv, fetchurl, cmake, libtiff, libpng, libjpeg, doxygen, python, + fftw, fftwSinglePrec, hdf5, boost, numpy }: +stdenv.mkDerivation rec { + name = "vigra-1.8.0"; src = fetchurl { - url = http://hci.iwr.uni-heidelberg.de/vigra/vigra-1.7.0-src.tar.gz; - sha256 = "1laf9p0h35xpzs98yd13alm17gh40sn9b7z01ylcja4g7p3a3hs4"; + url = "${meta.homepage}/${name}-src.tar.gz"; + sha256 = "0542qy1bqaq73l7i8aqdhwdbhd6m1wldsn1w2sfyf8yf4398ffpw"; }; - buildInputs = [ cmake fftw libtiff libpng libjpeg doxygen python ]; + buildInputs = [ cmake fftw fftwSinglePrec libtiff libpng libjpeg python boost + numpy hdf5 ]; cmakeFlags = if (stdenv.system == "x86_64-linux") then "-DCMAKE_CXX_FLAGS=-fPIC -DCMAKE_C_FLAGS=-fPIC" diff --git a/pkgs/development/tools/misc/coccinelle/default.nix b/pkgs/development/tools/misc/coccinelle/default.nix index 276c3bd1ed0a..ce3eb9cf5ec6 100644 --- a/pkgs/development/tools/misc/coccinelle/default.nix +++ b/pkgs/development/tools/misc/coccinelle/default.nix @@ -34,6 +34,10 @@ stdenv.mkDerivation rec { --prefix "LD_LIBRARY_PATH" ":" "$out/lib" \ --prefix "PYTHONPATH" ":" "$out/share/coccinelle/python" + wrapProgram "$out/bin/spatch.opt" \ + --prefix "LD_LIBRARY_PATH" ":" "$out/lib" \ + --prefix "PYTHONPATH" ":" "$out/share/coccinelle/python" + yes | make test ''; |