* Got rid of all --disable-static flags; they're redundant now.

* Also a bunch of style cleanups (tabs, with args, ...).

svn path=/nixpkgs/branches/stdenv-updates/; revision=15235
This commit is contained in:
Eelco Dolstra
2009-04-21 23:18:09 +00:00
parent 2a699fe5fb
commit 94d7d1fdbb
75 changed files with 241 additions and 336 deletions
@@ -1,21 +1,18 @@
args: with args;
let version = "0.10.10"; in
stdenv.mkDerivation rec {
name = "gnonlin-${version}";
stdenv.mkDerivation rec {
name = "gnonlin-0.10.10";
src = fetchurl {
url = "http://gstreamer.freedesktop.org/src/gnonlin/gnonlin-${version}.tar.gz";
sha256 = "041in2y0x3755hw29rhnyhsh216v2fl1q1p12m9faxiv2r52x83y";
};
src = fetchurl {
url = "http://gstreamer.freedesktop.org/src/gnonlin/${name}.tar.gz";
sha256 = "041in2y0x3755hw29rhnyhsh216v2fl1q1p12m9faxiv2r52x83y";
};
buildInputs = [ gstPluginsBase gstreamer pkgconfig ];
buildInputs = [ gstPluginsBase gstreamer pkgconfig ];
configureFlags = "--enable-shared --disable-static";
meta = {
homepage = "http://gstreamer.freedesktop.org/modules/gnonlin.html";
description = "http://gstreamer.freedesktop.org/modules/gnonlin.html";
license = "GPLv2+";
};
}
meta = {
homepage = "http://gstreamer.freedesktop.org/modules/gnonlin.html";
description = "http://gstreamer.freedesktop.org/modules/gnonlin.html";
license = "GPLv2+";
};
}
@@ -1,24 +1,24 @@
{ fetchurl, stdenv, pkgconfig, gstPluginsBase, bzip2 }:
let version = "0.10.5"; in
stdenv.mkDerivation rec {
name = "gst-ffmpeg-${version}";
stdenv.mkDerivation rec {
name = "gst-ffmpeg-0.10.5";
src = fetchurl {
url = "http://gstreamer.freedesktop.org/src/gst-ffmpeg/${name}.tar.bz2";
sha256 = "12y240jp2lda57frz7pj96izqxcns0k31cc5rp4kdfwwfdsvy5ik";
};
src = fetchurl {
url = "http://gstreamer.freedesktop.org/src/gst-ffmpeg/${name}.tar.bz2";
sha256 = "12y240jp2lda57frz7pj96izqxcns0k31cc5rp4kdfwwfdsvy5ik";
};
propagatedBuildInputs = [ gstPluginsBase ];
buildInputs = [ pkgconfig bzip2 ];
propagatedBuildInputs = [ gstPluginsBase ];
buildInputs = [ pkgconfig bzip2 ];
configureFlags = "--enable-shared --disable-static --enable-ladspa";
configureFlags = "--enable-ladspa";
meta = {
homepage = "http://gstreamer.freedesktop.org/releases/gst-ffmpeg/${version}.html";
meta = {
homepage = "http://gstreamer.freedesktop.org/releases/gst-ffmpeg";
description = "GStreamer's plug-in using FFmpeg";
description = "GStreamer's plug-in using FFmpeg";
license = "GPLv2+";
};
}
license = "GPLv2+";
};
}
@@ -13,8 +13,6 @@ stdenv.mkDerivation rec {
patchPhase = "sed -i 's@/bin/echo@echo@g' configure";
configureFlags = "--enable-shared --disable-static";
# TODO : v4l, libvisual
propagatedBuildInputs = [gstreamer libX11 libXv libXext alsaLib cdparanoia
libogg libtheora libvorbis freetype pango liboil gtk which gtkdoc];
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
taglib gdbm pulseaudio];
buildInputs = [pkgconfig];
configureFlags = "--enable-shared --disable-static --enable-ladspa";
configureFlags = "--enable-ladspa";
meta = {
homepage = http://gstreamer.freedesktop.org;
@@ -12,8 +12,9 @@ stdenv.mkDerivation rec {
buildInputs = [perl bison flex pkgconfig python which gtkdoc ];
propagatedBuildInputs = [glib libxml2];
configureFlags = "--enable-shared --disable-static --enable-failing-tests
--localstatedir=/var --disable-gtk-doc --disable-docbook";
configureFlags = ''
--enable-failing-tests --localstatedir=/var --disable-gtk-doc --disable-docbook
'';
meta = {
homepage = http://gstreamer.freedesktop.org;