mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-21 05:00:16 +00:00
svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=32347
This commit is contained in:
Yury G. Kudryashov
parent
ee75764bdb
commit
ed8caa2c7f
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, fetchurl, intltool, pkgconfig, gtk, libglade, libosip, libexosip, speex,
|
||||
readline, ffmpeg, alsaLib, SDL, libv4l, libtheora, libXv }:
|
||||
{ stdenv, fetchurl, intltool, pkgconfig, gtk, libglade, libosip, libexosip
|
||||
, speex, readline, mediastreamer }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "linphone-3.5.0";
|
||||
|
|
@ -9,14 +9,16 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1jrgsyx2mn6y50hjfx79fzqhp42r78cjr63w3bfjdl258zy2f6ix";
|
||||
};
|
||||
|
||||
buildInputs = [ intltool gtk libglade libosip libexosip speex readline
|
||||
ffmpeg alsaLib SDL libv4l libtheora libXv ];
|
||||
buildInputs = [ gtk libglade libosip libexosip readline mediastreamer speex ];
|
||||
|
||||
buildNativeInputs = [ pkgconfig ];
|
||||
buildNativeInputs = [ intltool pkgconfig ];
|
||||
|
||||
configureFlags = "--enable-external-ortp --enable-external-mediastreamer";
|
||||
|
||||
meta = {
|
||||
homepage = http://www.linphone.org/;
|
||||
description = "Open Source video SIP softphone";
|
||||
license = "GPLv2+";
|
||||
platforms = stdenv.lib.platforms.gnu;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -1,19 +0,0 @@
|
|||
source $stdenv/setup
|
||||
|
||||
tar -zxvf $src
|
||||
cd ext3cow-tools/
|
||||
|
||||
echo "Using: $kernel"
|
||||
|
||||
kernerlext3cowheader=$(ls $kernel/lib/modules/*/build/include/linux/ext3cow_fs.h)
|
||||
|
||||
kernerlext3cowheader_slashed=$(echo $kernerlext3cowheader | sed 's/\//\\\//g')
|
||||
|
||||
sed -i "s/linux\/ext3cow_fs.h/$kernerlext3cowheader_slashed/" ext3cow_tools.h #ugh dirty header rewrite....
|
||||
|
||||
make
|
||||
|
||||
ensureDir $out/bin/
|
||||
cp ss $out/bin/snapshot
|
||||
cp tt $out/bin/
|
||||
cp e2d $out/bin/
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
{stdenv, fetchurl, kernel_ext3cowpatched }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "ext3cow-tools";
|
||||
builder = ./builder.sh;
|
||||
|
||||
src = fetchurl {
|
||||
url = http://ext3cow.com/tools/ext3cow-tools.tgz;
|
||||
sha256 = "78f55b19c8eeaa7b8abde63c7d6547b1ac0421a46d826a8d41c049719a3081f2";
|
||||
};
|
||||
|
||||
kernel = kernel_ext3cowpatched;
|
||||
}
|
||||
|
||||
|
||||
#note that ext3cow requires the ext3cow kernel patch !!!!
|
||||
|
|
@ -1,44 +0,0 @@
|
|||
{ stdenv, fetchurl, aterm, db4, perl, curl, bzip2, openssl ? null
|
||||
|
||||
, ext3cowtools, e3cfsprogs, rsync
|
||||
, libtool, automake, autoconf
|
||||
, flex, bison
|
||||
|
||||
, docbook5, docbook5_xsl, libxslt, docbook_xml_dtd_43, w3m
|
||||
|
||||
, ext3cow_kernel
|
||||
|
||||
, storeDir ? "/nix/store"
|
||||
, stateDir ? "/nix/var"
|
||||
, nixStoreStateDir ? "/nix/state"
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "snix-0.12rev10946";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://www.denbreejen.net/public/nix/snix-20080304-rev10948.tar.gz;
|
||||
sha256 = "6973f080be8a32f1fc9b109f7f180b2bbd4e9e246721de9247378e49c6a70ef4";
|
||||
};
|
||||
|
||||
buildInputs = [perl curl openssl rsync libtool automake autoconf flex bison
|
||||
docbook5 docbook5_xsl libxslt docbook_xml_dtd_43 w3m ];
|
||||
|
||||
preConfigure = "
|
||||
./bootstrap.sh
|
||||
";
|
||||
|
||||
configureFlags = "
|
||||
--with-store-dir=${storeDir} --localstatedir=${stateDir}
|
||||
--with-aterm=${aterm} --with-bdb=${db4} --with-bzip2=${bzip2}
|
||||
--disable-init-state
|
||||
--with-store-state-dir=${nixStoreStateDir}
|
||||
--with-ext3cow-header=${ext3cow_kernel}/lib/modules/2.*/build/include/linux/ext3cow_fs.h
|
||||
--with-rsync=${rsync}/bin/rsync";
|
||||
|
||||
meta = {
|
||||
description = "The SNix Deployment System (Nix extended to handle state)";
|
||||
homepage = http://nixos.org/;
|
||||
license = "LGPL";
|
||||
};
|
||||
}
|
||||
|
|
@ -4731,7 +4731,9 @@ let
|
|||
|
||||
vcdimager = callPackage ../development/libraries/vcdimager { };
|
||||
|
||||
vigra = callPackage ../development/libraries/vigra { };
|
||||
vigra = callPackage ../development/libraries/vigra {
|
||||
inherit (pkgs.pythonPackages) numpy;
|
||||
};
|
||||
|
||||
vmime = callPackage ../development/libraries/vmime { };
|
||||
|
||||
|
|
@ -5910,10 +5912,6 @@ let
|
|||
splashutils =
|
||||
if kernel.features ? fbConDecor then pkgs.splashutils else null;
|
||||
|
||||
ext3cowtools = callPackage ../os-specific/linux/ext3cow-tools {
|
||||
kernel_ext3cowpatched = kernel;
|
||||
};
|
||||
|
||||
/* compiles but has to be integrated into the kernel somehow
|
||||
Let's have it uncommented and finish it..
|
||||
*/
|
||||
|
|
@ -5925,15 +5923,6 @@ let
|
|||
|
||||
perf = callPackage ../os-specific/linux/kernel/perf.nix { };
|
||||
|
||||
# State Nix
|
||||
snix = callPackage ../tools/package-management/snix {
|
||||
|
||||
aterm = aterm25;
|
||||
db4 = db45;
|
||||
|
||||
flex = flex2533;
|
||||
ext3cow_kernel = kernel; };
|
||||
|
||||
sysprof = callPackage ../development/tools/profiling/sysprof {
|
||||
inherit (gnome) gtk glib pango libglade;
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue