JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/applications/networking/browsers/icecat-3/default.nix
View File

@ -29,7 +29,6 @@ stdenv.mkDerivation {
"--enable-optimize" "--enable-optimize"
"--disable-debug" "--disable-debug"
"--disable-static" # needed for `libxul'
"--enable-strip" "--enable-strip"
"--with-system-jpeg" "--with-system-jpeg"
"--with-system-zlib" "--with-system-zlib"

2
pkgs/applications/version-management/subversion/1.5.nix
View File

@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
configureFlags = '' configureFlags = ''
--disable-keychain --disable-keychain
${if static then "--disable-shared --enable-all-static" else "--disable-static"} ${if static then "--disable-shared --enable-all-static" else ""}
${if bdbSupport then "--with-berkeley-db" else "--without-berkeley-db"} ${if bdbSupport then "--with-berkeley-db" else "--without-berkeley-db"}
${if httpServer then "--with-apxs=${httpd}/bin/apxs" else "--without-apxs"} ${if httpServer then "--with-apxs=${httpd}/bin/apxs" else "--without-apxs"}
${if pythonBindings || perlBindings then "--with-swig=${swig}" else "--without-swig"} ${if pythonBindings || perlBindings then "--with-swig=${swig}" else "--without-swig"}

2
pkgs/applications/version-management/subversion/1.6.nix
View File

@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
configureFlags = '' configureFlags = ''
--disable-keychain --disable-keychain
${if static then "--disable-shared --enable-all-static" else "--disable-static"} ${if static then "--disable-shared --enable-all-static" else ""}
${if bdbSupport then "--with-berkeley-db" else "--without-berkeley-db"} ${if bdbSupport then "--with-berkeley-db" else "--without-berkeley-db"}
${if httpServer then "--with-apxs=${httpd}/bin/apxs" else "--without-apxs"} ${if httpServer then "--with-apxs=${httpd}/bin/apxs" else "--without-apxs"}
${if pythonBindings || perlBindings then "--with-swig=${swig}" else "--without-swig"} ${if pythonBindings || perlBindings then "--with-swig=${swig}" else "--without-swig"}

4
pkgs/development/compilers/strategoxt/0.16.nix
View File

@ -20,8 +20,6 @@ rec {
--replace getopt ${getopt}/bin/getopt --replace getopt ${getopt}/bin/getopt
''; '';
configureFlags = "--disable-static";
meta = { meta = {
homepage = http://www.program-transformation.org/Sdf/SdfBundle; homepage = http://www.program-transformation.org/Sdf/SdfBundle;
meta = "Tools for the SDF2 Syntax Definition Formalism, including the `pgen' parser generator and `sglr' parser"; meta = "Tools for the SDF2 Syntax Definition Formalism, including the `pgen' parser generator and `sglr' parser";
@ -39,8 +37,6 @@ rec {
buildInputs = [pkgconfig aterm sdf getopt]; buildInputs = [pkgconfig aterm sdf getopt];
configureFlags = "--disable-static";
meta = { meta = {
homepage = http://strategoxt.org/; homepage = http://strategoxt.org/;
meta = "A language and toolset for program transformation"; meta = "A language and toolset for program transformation";

8
pkgs/development/compilers/strategoxt/0.17.nix
View File

@ -20,8 +20,6 @@ rec {
--replace getopt ${getopt}/bin/getopt --replace getopt ${getopt}/bin/getopt
''; '';
configureFlags = "--disable-static";
meta = { meta = {
homepage = http://www.program-transformation.org/Sdf/SdfBundle; homepage = http://www.program-transformation.org/Sdf/SdfBundle;
meta = "Tools for the SDF2 Syntax Definition Formalism, including the `pgen' parser generator and `sglr' parser"; meta = "Tools for the SDF2 Syntax Definition Formalism, including the `pgen' parser generator and `sglr' parser";
@ -39,8 +37,6 @@ rec {
buildInputs = [pkgconfig aterm sdf getopt]; buildInputs = [pkgconfig aterm sdf getopt];
configureFlags = "--disable-static";
meta = { meta = {
homepage = http://strategoxt.org/; homepage = http://strategoxt.org/;
meta = "A language and toolset for program transformation"; meta = "A language and toolset for program transformation";
@ -60,7 +56,7 @@ rec {
# !!! The explicit `--with-strategoxt' is necessary; otherwise we # !!! The explicit `--with-strategoxt' is necessary; otherwise we
# get an XTC registration that refers to "/share/strategoxt/XTC". # get an XTC registration that refers to "/share/strategoxt/XTC".
configureFlags = "--disable-static --enable-xtc --with-strategoxt=${strategoxt}"; configureFlags = "--enable-xtc --with-strategoxt=${strategoxt}";
meta = { meta = {
homepage = http://strategoxt.org/Stratego/JavaFront; homepage = http://strategoxt.org/Stratego/JavaFront;
@ -79,8 +75,6 @@ rec {
buildInputs = [jdk pkgconfig aterm sdf strategoxt javafront]; buildInputs = [jdk pkgconfig aterm sdf strategoxt javafront];
configureFlags = "--disable-static";
meta = { meta = {
homepage = http://strategoxt.org/Stratego/TheDryad; homepage = http://strategoxt.org/Stratego/TheDryad;
meta = "A collection of tools for developing transformation systems for Java source and bytecode"; meta = "A collection of tools for developing transformation systems for Java source and bytecode";

2
pkgs/development/interpreters/octave/default.nix
View File

@ -7,5 +7,5 @@ stdenv.mkDerivation {
sha256 = "1rkpzig0r0zrm73avxgai0zqkz9hv4js57i1xxdzcm22qw22szaj"; sha256 = "1rkpzig0r0zrm73avxgai0zqkz9hv4js57i1xxdzcm22qw22szaj";
}; };
buildInputs = [gfortran readline ncurses perl flex texinfo qhull]; buildInputs = [gfortran readline ncurses perl flex texinfo qhull];
configureFlags = "--enable-readline --enable-dl --disable-static --enable-shared"; configureFlags = "--enable-readline --enable-dl";
} }

2
pkgs/development/interpreters/octave/hg.nix
View File

@ -5,7 +5,7 @@ let commonBuildInputs = [gfortran readline ncurses perl glibc qhull libX11 texin
stdenv.mkDerivation ({ stdenv.mkDerivation ({
NIX_LDFLAGS = "-lpthread"; NIX_LDFLAGS = "-lpthread";
configureFlags = "--enable-readline --enable-dl --disable-static --enable-shared"; configureFlags = "--enable-readline --enable-dl";
meta = { meta = {
description = "High-level interactive language for numerical computations"; description = "High-level interactive language for numerical computations";
homepage = http://www.octave.org; homepage = http://www.octave.org;

2
pkgs/development/libraries/a52dec/default.nix
View File

@ -8,8 +8,6 @@ stdenv.mkDerivation rec {
sha256 = "0czccp4fcpf2ykp16xcrzdfmnircz1ynhls334q374xknd5747d2"; sha256 = "0czccp4fcpf2ykp16xcrzdfmnircz1ynhls334q374xknd5747d2";
}; };
configureFlags = "--enable-shared --disable-static";
NIX_CFLAGS_COMPILE = "-fpic"; NIX_CFLAGS_COMPILE = "-fpic";
meta = { meta = {

2
pkgs/development/libraries/avahi/default.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
configureFlags = '' configureFlags = ''
--disable-qt3 --disable-gdbm --disable-gtk --disable-mono --disable-qt3 --disable-gdbm --disable-gtk --disable-mono
--${if qt4Support then "enable" else "disable"}-qt4 --${if qt4Support then "enable" else "disable"}-qt4
--with-distro=none --enable-shared --disable-static --disable-python --with-distro=none --disable-python
''; '';
meta = { meta = {

15
pkgs/development/libraries/buddy/default.nix
View File

@ -1,19 +1,20 @@
{ stdenv, fetchurl }: { stdenv, fetchurl }:
stdenv.mkDerivation rec stdenv.mkDerivation rec {
{
name = "buddy-2.4"; name = "buddy-2.4";
meta =
{ meta = {
homepage = "http://sourceforge.net/projects/buddy/"; homepage = "http://sourceforge.net/projects/buddy/";
description = "binary decision diagram package"; description = "binary decision diagram package";
license = "as-is"; license = "as-is";
}; };
src = fetchurl
{ src = fetchurl {
url = "mirror://sourceforge/buddy/${name}.tar.gz"; url = "mirror://sourceforge/buddy/${name}.tar.gz";
sha256 = "0dl86l9xkl33wnkz684xa9axhcxx2zzi4q5lii0axnb9lsk81pyk"; sha256 = "0dl86l9xkl33wnkz684xa9axhcxx2zzi4q5lii0axnb9lsk81pyk";
}; };
configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3 --disable-static";
configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3";
doCheck = true; doCheck = true;
} }

2
pkgs/development/libraries/cairo/default.nix
View File

@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
stdenv.lib.optional postscriptSupport zlib ++ stdenv.lib.optional postscriptSupport zlib ++
stdenv.lib.optional pngSupport libpng; stdenv.lib.optional pngSupport libpng;
configureFlags = ["--disable-static" "--enable-xcb"] ++ configureFlags = ["--enable-xcb"] ++
stdenv.lib.optional pdfSupport "--enable-pdf"; stdenv.lib.optional pdfSupport "--enable-pdf";
preConfigure = '' preConfigure = ''

3
pkgs/development/libraries/cairomm/default.nix
View File

@ -9,9 +9,8 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [pkgconfig]; buildInputs = [pkgconfig];
propagatedBuildInputs = [ cairo x11 fontconfig freetype libsigcxx ];
configureFlags = "--enable-shared --disable-static"; propagatedBuildInputs = [ cairo x11 fontconfig freetype libsigcxx ];
meta = { meta = {
description = "A 2D graphics library with support for multiple output devices"; description = "A 2D graphics library with support for multiple output devices";

2
pkgs/development/libraries/clucene-core/default.nix
View File

@ -1,4 +1,5 @@
args: with args; args: with args;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "clucene-core-0.9.20"; name = "clucene-core-0.9.20";
@ -6,7 +7,6 @@ stdenv.mkDerivation rec {
url = "mirror://sf/clucene/${name}.tar.bz2"; url = "mirror://sf/clucene/${name}.tar.bz2";
sha256 = "1hwq3b4qp1dgygmypgpg3blj68wnksq2rbqkwyxvl5dldn12q7rg"; sha256 = "1hwq3b4qp1dgygmypgpg3blj68wnksq2rbqkwyxvl5dldn12q7rg";
}; };
configureFlags = "--disable-static";
meta = { meta = {
description = "CLucene is a port of the very popular Java Lucene text search engine API. Core package."; description = "CLucene is a port of the very popular Java Lucene text search engine API. Core package.";

4
pkgs/development/libraries/cppunit/default.nix
View File

@ -1,10 +1,10 @@
args: with args; {stdenv, fetchurl}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "cppunit-1.12.0"; name = "cppunit-1.12.0";
src = fetchurl { src = fetchurl {
url = mirror://sf/cppunit/cppunit-1.12.0.tar.gz; url = mirror://sf/cppunit/cppunit-1.12.0.tar.gz;
sha256 = "07zyyx5dyai94y8r8va28971f5mw84mb93xx9pm6m4ddpj6c79cq"; sha256 = "07zyyx5dyai94y8r8va28971f5mw84mb93xx9pm6m4ddpj6c79cq";
}; };
configureFlags = "--enable-shared --disable-static";
} }

5
pkgs/development/libraries/dbus-glib/default.nix
View File

@ -2,13 +2,16 @@ args: with args;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "dbus-glib-0.74"; name = "dbus-glib-0.74";
src = fetchurl { src = fetchurl {
url = "${meta.homepage}/releases/dbus-glib/${name}.tar.gz"; url = "${meta.homepage}/releases/dbus-glib/${name}.tar.gz";
sha256 = "1qmbnd9xgg7vahlfywd8sfd9yqhx8jdyczz3cshfsd4qc76xhw78"; sha256 = "1qmbnd9xgg7vahlfywd8sfd9yqhx8jdyczz3cshfsd4qc76xhw78";
}; };
buildInputs = [pkgconfig expat gettext]; buildInputs = [pkgconfig expat gettext];
propagatedBuildInputs = [dbus.libs glib]; propagatedBuildInputs = [dbus.libs glib];
configureFlags = "--enable-shared --disable-static";
passthru = { inherit dbus glib; }; passthru = { inherit dbus glib; };
meta = { meta = {

2
pkgs/development/libraries/dbus/default.nix
View File

@ -8,7 +8,7 @@ let
sha256 = "1f7v79ws34mh6j75fk6w4w9v441vffll0fwf5vk94mwa0bc28g5b"; sha256 = "1f7v79ws34mh6j75fk6w4w9v441vffll0fwf5vk94mwa0bc28g5b";
}; };
configureFlags = "--disable-static --localstatedir=/var --with-session-socket-dir=/tmp"; configureFlags = "--localstatedir=/var --with-session-socket-dir=/tmp";
in rec { in rec {

4
pkgs/development/libraries/enchant/1.3.0.nix
View File

@ -1,12 +1,14 @@
args: with args; args: with args;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "enchant-" + version; name = "enchant-" + version;
src = fetchurl { src = fetchurl {
url = "http://www.abisource.com/downloads/enchant/${version}/${name}.tar.gz"; url = "http://www.abisource.com/downloads/enchant/${version}/${name}.tar.gz";
sha256 = "1vwqwsadnp4rf8wj7d4rglvszjzlcli0jyxh06h8inka1sm1al76"; sha256 = "1vwqwsadnp4rf8wj7d4rglvszjzlcli0jyxh06h8inka1sm1al76";
}; };
buildInputs = [aspell pkgconfig glib]; buildInputs = [aspell pkgconfig glib];
configureFlags = "--enable-shared --disable-static";
meta = { meta = {
homepage = http://www.abisource.com/enchant; homepage = http://www.abisource.com/enchant;

2
pkgs/development/libraries/exiv2/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
buildInputs = [zlib]; buildInputs = [zlib];
configureFlags = "--with-zlib=${zlib} --enable-shared --disable-static --disable-xmp"; configureFlags = "--with-zlib=${zlib} --disable-xmp";
meta = { meta = {
homepage = http://www.exiv2.org/; homepage = http://www.exiv2.org/;

2
pkgs/development/libraries/faad2/default.nix
View File

@ -8,8 +8,6 @@ stdenv.mkDerivation {
sha256 = "1db37ydb6mxhshbayvirm5vz6j361bjim4nkpwjyhmy4ddfinmhl"; sha256 = "1db37ydb6mxhshbayvirm5vz6j361bjim4nkpwjyhmy4ddfinmhl";
}; };
configureFlags = "--disable-static";
meta = { meta = {
description = "An open source MPEG-4 and MPEG-2 AAC decoder"; description = "An open source MPEG-4 and MPEG-2 AAC decoder";
homepage = http://www.audiocoding.com/faad2.html; homepage = http://www.audiocoding.com/faad2.html;

2
pkgs/development/libraries/ffmpeg/default.nix
View File

@ -12,8 +12,6 @@ stdenv.mkDerivation {
# the resulting library is GPL'ed, so it can only be used in GPL'ed # the resulting library is GPL'ed, so it can only be used in GPL'ed
# applications. # applications.
configureFlags = '' configureFlags = ''
--enable-shared
--disable-static
--enable-gpl --enable-gpl
--enable-postproc --enable-postproc
--enable-swscale --enable-swscale

4
pkgs/development/libraries/gamin/default.nix
View File

@ -1,4 +1,5 @@
args: with args; args: with args;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gamin-0.1.9"; name = "gamin-0.1.9";
@ -11,6 +12,5 @@ stdenv.mkDerivation rec {
# `_GNU_SOURCE' is needed, e.g., to get `struct ucred' from # `_GNU_SOURCE' is needed, e.g., to get `struct ucred' from
# <sys/socket.h> with Glibc 2.9. # <sys/socket.h> with Glibc 2.9.
configureFlags = "--enable-shared --disable-static --disable-debug" configureFlags = "--disable-debug --with-python=${python} CPPFLAGS=-D_GNU_SOURCE";
+ " --with-python=${python} CPPFLAGS=-D_GNU_SOURCE";
} }

9
pkgs/development/libraries/gettext/0.14.6.nix
View File

@ -1,9 +0,0 @@
args: with args;
stdenv.mkDerivation {
name = "gettext-0.14.6";
src = fetchurl {
url = mirror://gnu/gettext/gettext-0.14.6.tar.gz;
md5 = "c26fc7f0a493c5c7c39bbc4e7ed42790";
};
configureFlags = "--disable-csharp";
}

9
pkgs/development/libraries/gettext/0.15.nix
View File

@ -1,9 +0,0 @@
args: with args;
stdenv.mkDerivation {
name = "gettext-0.15";
src = fetchurl {
url = mirror://gnu/gettext/gettext-0.15.tar.gz;
md5 = "16bc6e4d37ac3d07495f737a2349a22b";
};
configureFlags = "--disable-csharp";
}

9
pkgs/development/libraries/gettext/0.16.x.nix
View File

@ -1,9 +0,0 @@
args: with args;
stdenv.mkDerivation {
name = "gettext-0.16.1";
src = fetchurl {
url = mirror://gnu/gettext/gettext-0.16.1.tar.gz;
md5 = "3d9ad24301c6d6b17ec30704a13fe127";
};
configureFlags = "--disable-csharp";
}

9
pkgs/development/libraries/gettext/0.17.nix → pkgs/development/libraries/gettext/default.nix
View File

@ -1,9 +1,12 @@
args: with args; {stdenv, fetchurl}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gettext-" + version; name = "gettext-0.17";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/gettext/${name}.tar.gz"; url = "mirror://gnu/gettext/${name}.tar.gz";
sha256 = "1fipjpaxxwifdw6cbr7mkxp1yvy643i38nhlh7124bqnisxki5i0"; sha256 = "1fipjpaxxwifdw6cbr7mkxp1yvy643i38nhlh7124bqnisxki5i0";
}; };
configureFlags = "--disable-csharp --enable-shared --disable-static";
configureFlags = "--disable-csharp";
} }

2
pkgs/development/libraries/gsl/default.nix
View File

@ -10,8 +10,6 @@ stdenv.mkDerivation rec {
doCheck = true; doCheck = true;
configureFlags = "--disable-static";
meta = { meta = {
description = "The GNU Scientific Library, a large numerical library"; description = "The GNU Scientific Library, a large numerical library";

11
pkgs/development/libraries/gstreamer/gnonlin/default.nix
View File

@ -1,21 +1,18 @@
args: with args; args: with args;
let version = "0.10.10"; in stdenv.mkDerivation rec {
stdenv.mkDerivation rec { name = "gnonlin-0.10.10";
name = "gnonlin-${version}";
src = fetchurl { src = fetchurl {
url = "http://gstreamer.freedesktop.org/src/gnonlin/gnonlin-${version}.tar.gz"; url = "http://gstreamer.freedesktop.org/src/gnonlin/${name}.tar.gz";
sha256 = "041in2y0x3755hw29rhnyhsh216v2fl1q1p12m9faxiv2r52x83y"; sha256 = "041in2y0x3755hw29rhnyhsh216v2fl1q1p12m9faxiv2r52x83y";
}; };
buildInputs = [ gstPluginsBase gstreamer pkgconfig ]; buildInputs = [ gstPluginsBase gstreamer pkgconfig ];
configureFlags = "--enable-shared --disable-static";
meta = { meta = {
homepage = "http://gstreamer.freedesktop.org/modules/gnonlin.html"; homepage = "http://gstreamer.freedesktop.org/modules/gnonlin.html";
description = "http://gstreamer.freedesktop.org/modules/gnonlin.html"; description = "http://gstreamer.freedesktop.org/modules/gnonlin.html";
license = "GPLv2+"; license = "GPLv2+";
}; };
} }

12
pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix
View File

@ -1,8 +1,7 @@
{ fetchurl, stdenv, pkgconfig, gstPluginsBase, bzip2 }: { fetchurl, stdenv, pkgconfig, gstPluginsBase, bzip2 }:
let version = "0.10.5"; in stdenv.mkDerivation rec {
stdenv.mkDerivation rec { name = "gst-ffmpeg-0.10.5";
name = "gst-ffmpeg-${version}";
src = fetchurl { src = fetchurl {
url = "http://gstreamer.freedesktop.org/src/gst-ffmpeg/${name}.tar.bz2"; url = "http://gstreamer.freedesktop.org/src/gst-ffmpeg/${name}.tar.bz2";
@ -10,15 +9,16 @@ let version = "0.10.5"; in
}; };
propagatedBuildInputs = [ gstPluginsBase ]; propagatedBuildInputs = [ gstPluginsBase ];
buildInputs = [ pkgconfig bzip2 ]; buildInputs = [ pkgconfig bzip2 ];
configureFlags = "--enable-shared --disable-static --enable-ladspa"; configureFlags = "--enable-ladspa";
meta = { meta = {
homepage = "http://gstreamer.freedesktop.org/releases/gst-ffmpeg/${version}.html"; 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+";
}; };
} }

2
pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix
View File

@ -13,8 +13,6 @@ stdenv.mkDerivation rec {
patchPhase = "sed -i 's@/bin/echo@echo@g' configure"; patchPhase = "sed -i 's@/bin/echo@echo@g' configure";
configureFlags = "--enable-shared --disable-static";
# TODO : v4l, libvisual # TODO : v4l, libvisual
propagatedBuildInputs = [gstreamer libX11 libXv libXext alsaLib cdparanoia propagatedBuildInputs = [gstreamer libX11 libXv libXext alsaLib cdparanoia
libogg libtheora libvorbis freetype pango liboil gtk which gtkdoc]; libogg libtheora libvorbis freetype pango liboil gtk which gtkdoc];

2
pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
taglib gdbm pulseaudio]; taglib gdbm pulseaudio];
buildInputs = [pkgconfig]; buildInputs = [pkgconfig];
configureFlags = "--enable-shared --disable-static --enable-ladspa"; configureFlags = "--enable-ladspa";
meta = { meta = {
homepage = http://gstreamer.freedesktop.org; homepage = http://gstreamer.freedesktop.org;

5
pkgs/development/libraries/gstreamer/gstreamer/default.nix
View File

@ -12,8 +12,9 @@ stdenv.mkDerivation rec {
buildInputs = [perl bison flex pkgconfig python which gtkdoc ]; buildInputs = [perl bison flex pkgconfig python which gtkdoc ];
propagatedBuildInputs = [glib libxml2]; propagatedBuildInputs = [glib libxml2];
configureFlags = "--enable-shared --disable-static --enable-failing-tests configureFlags = ''
--localstatedir=/var --disable-gtk-doc --disable-docbook"; --enable-failing-tests --localstatedir=/var --disable-gtk-doc --disable-docbook
'';
meta = { meta = {
homepage = http://gstreamer.freedesktop.org; homepage = http://gstreamer.freedesktop.org;

2
pkgs/development/libraries/id3lib/default.nix
View File

@ -2,9 +2,9 @@
stdenv.mkDerivation { stdenv.mkDerivation {
name = "id3lib-3.8.3"; name = "id3lib-3.8.3";
src = fetchurl { src = fetchurl {
url = mirror://sourceforge/id3lib/id3lib-3.8.3.tar.gz; url = mirror://sourceforge/id3lib/id3lib-3.8.3.tar.gz;
md5 = "19f27ddd2dda4b2d26a559a4f0f402a7"; md5 = "19f27ddd2dda4b2d26a559a4f0f402a7";
}; };
configureFlags = "--disable-static";
} }

3
pkgs/development/libraries/ilbc/default.nix
View File

@ -1,4 +1,5 @@
args: with args; args: with args;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ilbc-rfc3951"; name = "ilbc-rfc3951";
@ -12,6 +13,4 @@ stdenv.mkDerivation {
phases = "unpackPhase installPhase"; phases = "unpackPhase installPhase";
installPhase = "cp ilbc-rfc3951.tar.gz \${out}"; installPhase = "cp ilbc-rfc3951.tar.gz \${out}";
}; };
configureFlags = "--enable-shared --disable-static";
} }

5
pkgs/development/libraries/ilmbase/default.nix
View File

@ -1,9 +1,10 @@
args: with args; {stdenv, fetchurl}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ilmbase-1.0.1"; name = "ilmbase-1.0.1";
src = fetchurl { src = fetchurl {
url = http://download.savannah.nongnu.org/releases/openexr/ilmbase-1.0.1.tar.gz; url = http://download.savannah.nongnu.org/releases/openexr/ilmbase-1.0.1.tar.gz;
sha256 = "0z9r3r0bxyhgwhkdwln0dg1lnxz691qnjygrqlg3jym34rxzq52g"; sha256 = "0z9r3r0bxyhgwhkdwln0dg1lnxz691qnjygrqlg3jym34rxzq52g";
}; };
configureFlags = "--enable-shared --disable-static";
} }

1
pkgs/development/libraries/indilib/default.nix
View File

@ -8,7 +8,6 @@ stdenv.mkDerivation {
}; };
propagatedBuildInputs = [cfitsio libusb zlib]; propagatedBuildInputs = [cfitsio libusb zlib];
configureFlags = "--enable-shared --disable-static";
meta = { meta = {
homepage = http://indi.sf.net; homepage = http://indi.sf.net;

2
pkgs/development/libraries/jasper/default.nix
View File

@ -10,8 +10,6 @@ stdenv.mkDerivation rec {
buildInputs = [unzip libjpeg]; buildInputs = [unzip libjpeg];
configureFlags = "--enable-shared --disable-static";
meta = { meta = {
homepage = http://www.ece.uvic.ca/~mdadams/jasper/; homepage = http://www.ece.uvic.ca/~mdadams/jasper/;
description = "JasPer JPEG2000 Library"; description = "JasPer JPEG2000 Library";

10
pkgs/development/libraries/kerberos/heimdal.nix
View File

@ -1,14 +1,18 @@
args: with args; args: with args;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "heimdal-1.0.2"; name = "heimdal-1.0.2";
src = fetchurl { src = fetchurl {
urls = [ "http://www.h5l.org/dist/src/${name}.tar.gz" urls = [
"http://ftp.pdc.kth.se/pub/heimdal/src/${name}.tar.gz" ]; "http://www.h5l.org/dist/src/${name}.tar.gz"
"http://ftp.pdc.kth.se/pub/heimdal/src/${name}.tar.gz"
];
sha256 = "1h4x41lpv2abpv5l3yjd58pfzs0kkp5sbnih9iykhwd6sii1iig5"; sha256 = "1h4x41lpv2abpv5l3yjd58pfzs0kkp5sbnih9iykhwd6sii1iig5";
}; };
## ugly, X should be made an option ## ugly, X should be made an option
configureFlags = "--enable-shared --disable-static --with-openldap=${openldap} --without-x"; configureFlags = "--with-openldap=${openldap} --without-x";
propagatedBuildInputs = [ readline db4 openssl openldap cyrus_sasl ]; propagatedBuildInputs = [ readline db4 openssl openldap cyrus_sasl ];
} }

2
pkgs/development/libraries/libarchive/2.4.11.nix
View File

@ -1,2 +0,0 @@
args:
import ./common.nix "1iq5hs4hbqyl6sqiqlaj3j89vpfqx6zv974c965nxjvmwy816dbz" args

2
pkgs/development/libraries/libarchive/2.4.12.nix
View File

@ -1,2 +0,0 @@
args:
import ./common.nix "133kxx1wfangrhy6rcpqlqib7i45qxj8pcp3i9n574cwfx41swy4" args

18
pkgs/development/libraries/libarchive/common.nix
View File

@ -1,18 +0,0 @@
sha256: args: with args;
stdenv.mkDerivation rec {
name = "libarchive-" + version;
src = fetchurl {
url = "${meta.homepage}/src/${name}.tar.gz";
inherit sha256;
};
propagatedBuildInputs = [zlib bzip2 e2fsprogs];
buildInputs = [sharutils];
configureFlags = "--enable-shared --disable-static";
meta = {
description = "A library for reading and writing streaming archives";
homepage = http://people.freebsd.org/~kientzle/libarchive;
};
}

19
pkgs/development/libraries/libarchive/default.nix Normal file
View File

@ -0,0 +1,19 @@
{fetchurl, stdenv, zlib, bzip2, e2fsprogs, sharutils}:
stdenv.mkDerivation rec {
name = "libarchive-2.4.12";
src = fetchurl {
url = "${meta.homepage}/src/${name}.tar.gz";
sha256 = "133kxx1wfangrhy6rcpqlqib7i45qxj8pcp3i9n574cwfx41swy4";
};
propagatedBuildInputs = [zlib bzip2 e2fsprogs];
buildInputs = [sharutils];
meta = {
description = "A library for reading and writing streaming archives";
homepage = http://people.freebsd.org/~kientzle/libarchive;
};
}

2
pkgs/development/libraries/libidn/default.nix
View File

@ -8,8 +8,6 @@ stdenv.mkDerivation rec {
sha256 = "07p7cnmfnq7ds8a56iqmxps46bzznn92xxpdlnnp3n6pwcnidmn7"; sha256 = "07p7cnmfnq7ds8a56iqmxps46bzznn92xxpdlnnp3n6pwcnidmn7";
}; };
configureFlags = "--disable-static";
doCheck = true; doCheck = true;
meta = { meta = {

2
pkgs/development/libraries/libksba/default.nix
View File

@ -10,8 +10,6 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [libgpgerror]; propagatedBuildInputs = [libgpgerror];
configureFlags = "--enable-shared --disable-static";
meta = { meta = {
homepage = http://www.gnupg.org; homepage = http://www.gnupg.org;
description = "Libksba is a CMS and X.509 access library under development"; description = "Libksba is a CMS and X.509 access library under development";

2
pkgs/development/libraries/libnova/default.nix
View File

@ -1,4 +1,5 @@
args: with args; args: with args;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libnova-0.12.1"; name = "libnova-0.12.1";
@ -6,7 +7,6 @@ stdenv.mkDerivation rec {
url = "mirror://sf/libnova/${name}.tar.gz"; url = "mirror://sf/libnova/${name}.tar.gz";
sha256 = "0bs6c45q4qkrns36qndl8vns5gvhgpd90hi68bhah4r4hrg48lw0"; sha256 = "0bs6c45q4qkrns36qndl8vns5gvhgpd90hi68bhah4r4hrg48lw0";
}; };
configureFlags = "--enable-shared --disable-static";
meta = { meta = {
description = "Celestial Mechanics, Astrometry and Astrodynamics Library"; description = "Celestial Mechanics, Astrometry and Astrodynamics Library";

19
pkgs/development/libraries/liboil/0.3.13.nix
View File

@ -1,19 +0,0 @@
args: with args;
stdenv.mkDerivation rec {
name = "liboil-" + version;
src = fetchurl {
url = "${meta.homepage}/download/${name}.tar.gz";
sha256 = "0cndfz98zca40qc1d2waq1dkfx32yscbllbvlnlhjp4cjlkyh9qg";
};
configureFlags = "--enable-shared --disable-static";
buildInputs = [pkgconfig glib];
meta = {
homepage = http://liboil.freedesktop.org;
description = "A library of simple functions that are optimized for various CPUs";
};
}

6
pkgs/development/libraries/liboil/0.3.15.nix → pkgs/development/libraries/liboil/default.nix
View File

@ -1,15 +1,13 @@
args: with args; {stdenv, fetchurl, pkgconfig, glib}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "liboil-" + version; name = "liboil-0.3.15";
src = fetchurl { src = fetchurl {
url = "${meta.homepage}/download/${name}.tar.gz"; url = "${meta.homepage}/download/${name}.tar.gz";
sha256 = "1m3zcl54sf21cf2ckzny16ihymz8whi60ymyrhmd3m1dlw1knpmf"; sha256 = "1m3zcl54sf21cf2ckzny16ihymz8whi60ymyrhmd3m1dlw1knpmf";
}; };
configureFlags = "--enable-shared --disable-static";
buildInputs = [pkgconfig glib]; buildInputs = [pkgconfig glib];
meta = { meta = {

4
pkgs/development/libraries/libsigsegv/2.5.nix
View File

@ -1,7 +1,8 @@
args: with args; args: with args;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libsigsegv-" + version; name = "libsigsegv-2.5";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/libsigsegv/${name}.tar.gz"; url = "mirror://gnu/libsigsegv/${name}.tar.gz";
sha256 = "0fvcsq9msi63vrbpvks6mqkrnls5cfy6bzww063sqhk2h49vsyyg"; sha256 = "0fvcsq9msi63vrbpvks6mqkrnls5cfy6bzww063sqhk2h49vsyyg";
@ -12,6 +13,5 @@ stdenv.mkDerivation rec {
description = "A library for handling page faults in user mode"; description = "A library for handling page faults in user mode";
}; };
configureFlags = "--enable-shared --disable-static";
doCheck = true; doCheck = true;
} }

2
pkgs/development/libraries/libunwind/default.nix
View File

@ -8,8 +8,6 @@ stdenv.mkDerivation rec {
sha256 = "1qfxqkyx4r5dmwajyhvsyyl8zwxs6n2rcg7a61fgfdfp0gxvpzgx"; sha256 = "1qfxqkyx4r5dmwajyhvsyyl8zwxs6n2rcg7a61fgfdfp0gxvpzgx";
}; };
configureFlags = "--enable-shared --disable-static";
NIX_CFLAGS_COMPILE = if stdenv.system == "x86_64-linux" then "-fPIC" else ""; NIX_CFLAGS_COMPILE = if stdenv.system == "x86_64-linux" then "-fPIC" else "";
meta = { meta = {

9
pkgs/development/libraries/libxklavier/3.4.nix → pkgs/development/libraries/libxklavier/default.nix
View File

@ -1,7 +1,7 @@
args: with args; args: with args;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libxklavier-" + version; name = "libxklavier-3.4";
src = fetchurl { src = fetchurl {
url = "mirror://sf/gswitchit/${name}.tar.gz"; url = "mirror://sf/gswitchit/${name}.tar.gz";
@ -10,10 +10,13 @@ stdenv.mkDerivation rec {
# TODO: enable xmodmap support, needs xmodmap DB # TODO: enable xmodmap support, needs xmodmap DB
propagatedBuildInputs = [libX11 xkeyboard_config libxml2 libICE glib libxkbfile]; propagatedBuildInputs = [libX11 xkeyboard_config libxml2 libICE glib libxkbfile];
buildInputs = [pkgconfig]; buildInputs = [pkgconfig];
configureFlags = "--enable-shared --disable-static
configureFlags = ''
--with-xkb-base=${xkeyboard_config}/etc/X11/xkb --with-xkb-base=${xkeyboard_config}/etc/X11/xkb
--disable-xmodmap-support"; --disable-xmodmap-support
'';
meta = { meta = {
homepage = http://freedesktop.org/wiki/Software/LibXklavier; homepage = http://freedesktop.org/wiki/Software/LibXklavier;

5
pkgs/development/libraries/libzip/default.nix
View File

@ -1,12 +1,13 @@
args: with args; {stdenv, fetchurl, zlib}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "libzip-0.8"; name = "libzip-0.8";
src = fetchurl { src = fetchurl {
url = http://www.nih.at/libzip/libzip-0.8.tar.gz; url = http://www.nih.at/libzip/libzip-0.8.tar.gz;
sha256 = "0iy04c3b2yfwl9lpgwzm12qkdskbxj8l91r6mgn8f6ib00fj66ss"; sha256 = "0iy04c3b2yfwl9lpgwzm12qkdskbxj8l91r6mgn8f6ib00fj66ss";
}; };
configureFlags = "--enable-shared --disable-static";
buildInputs = [zlib]; buildInputs = [zlib];
meta = { meta = {

3
pkgs/development/libraries/loudmouth/default.nix
View File

@ -9,7 +9,6 @@ stdenv.mkDerivation {
}; };
propagatedBuildInputs = [gnutls libidn glib zlib]; propagatedBuildInputs = [gnutls libidn glib zlib];
buildInputs = [pkgconfig];
configureFlags = "--enable-shared --disable-static"; buildInputs = [pkgconfig];
} }

2
pkgs/development/libraries/lzo/default.nix
View File

@ -8,8 +8,6 @@ stdenv.mkDerivation rec {
sha256 = "8b1b0da8f757b9ac318e1c15a0eac8bdb56ca902a2dd25beda06c0f265f22591"; sha256 = "8b1b0da8f757b9ac318e1c15a0eac8bdb56ca902a2dd25beda06c0f265f22591";
}; };
configureFlags = "--enable-shared --disable-static";
meta = { meta = {
description = "A data compresion library suitable for real-time data de-/compression"; description = "A data compresion library suitable for real-time data de-/compression";
homepage = http://www.oberhumer.com/opensource/lzo; homepage = http://www.oberhumer.com/opensource/lzo;

2
pkgs/development/libraries/mediastreamer/2.2.0-cvs20080207.nix
View File

@ -18,5 +18,5 @@ stdenv.mkDerivation rec {
patches = [ ./h264.patch ./plugins.patch ]; patches = [ ./h264.patch ./plugins.patch ];
configureFlags = "--enable-external-ortp --enable-shared --disable-static"; configureFlags = "--enable-external-ortp";
} }

2
pkgs/development/libraries/mpeg2dec/default.nix
View File

@ -8,8 +8,6 @@ stdenv.mkDerivation {
sha256 = "1vny7rg0p2rmic71hli2l2612i5yaw8vy0wsnm5nvhwfiw37cjn7"; sha256 = "1vny7rg0p2rmic71hli2l2612i5yaw8vy0wsnm5nvhwfiw37cjn7";
}; };
configureFlags = "--enable-shared --disable-static";
meta = { meta = {
homepage = http://libmpeg2.sourceforge.net/; homepage = http://libmpeg2.sourceforge.net/;
description = "A free library for decoding mpeg-2 and mpeg-1 video streams"; description = "A free library for decoding mpeg-2 and mpeg-1 video streams";

1
pkgs/development/libraries/neon/0.26.nix
View File

@ -17,7 +17,6 @@ stdenv.mkDerivation {
buildInputs = [libxml2] ++ stdenv.lib.optional compressionSupport zlib; buildInputs = [libxml2] ++ stdenv.lib.optional compressionSupport zlib;
configureFlags = '' configureFlags = ''
--enable-shared --disable-static
${if compressionSupport then "--with-zlib" else "--without-zlib"} ${if compressionSupport then "--with-zlib" else "--without-zlib"}
${if sslSupport then "--with-ssl --with-libs=${openssl}" else "--without-ssl"} ${if sslSupport then "--with-ssl --with-libs=${openssl}" else "--without-ssl"}
''; '';

9
pkgs/development/libraries/openbabel/default.nix
View File

@ -2,13 +2,14 @@
stdenv.mkDerivation { stdenv.mkDerivation {
name = "openbabel-2.2.1"; name = "openbabel-2.2.1";
src = fetchurl { src = fetchurl {
url = mirror://sf/openbabel/openbabel-2.2.1.tar.gz; url = mirror://sf/openbabel/openbabel-2.2.1.tar.gz;
sha256 = "822345d70778de1d2d9afe65a659f1719b8ca300066fb1fa2f473bc97c457e80"; sha256 = "822345d70778de1d2d9afe65a659f1719b8ca300066fb1fa2f473bc97c457e80";
}; };
# TODO : perl & python bindings;
# TODO : wxGTK: I have no time to compile # TODO : perl & python bindings;
# TODO : separate lib and apps # TODO : wxGTK: I have no time to compile
# TODO : separate lib and apps
buildInputs = [ zlib libxml2 ]; buildInputs = [ zlib libxml2 ];
configureFlags = "--enable-shared --disable-static";
} }

2
pkgs/development/libraries/openexr/default.nix
View File

@ -11,5 +11,5 @@ stdenv.mkDerivation {
}; };
buildInputs = [pkgconfig zlib] ++ (lib.optional (args ? ctl) (args.ctl)); buildInputs = [pkgconfig zlib] ++ (lib.optional (args ? ctl) (args.ctl));
propagatedBuildInputs = [pkgconfig zlib ilmbase]; propagatedBuildInputs = [pkgconfig zlib ilmbase];
configureFlags = "--enable-shared --disable-static --enable-imfexamples"; configureFlags = "--enable-imfexamples";
} }

2
pkgs/development/libraries/openldap/default.nix
View File

@ -10,8 +10,6 @@ stdenv.mkDerivation {
buildInputs = [openssl cyrus_sasl db4 groff]; buildInputs = [openssl cyrus_sasl db4 groff];
configureFlags = "--disable-static";
dontPatchELF = 1; # !!! dontPatchELF = 1; # !!!
# Build on Glibc 2.9. # Build on Glibc 2.9.

16
pkgs/development/libraries/ortp/0.7.1.nix
View File

@ -1,16 +0,0 @@
args: with args;
stdenv.mkDerivation rec {
name = "ortp-" + version;
src = fetchurl {
url = "mirror://savannah/linphone/ortp/sources/${name}.tar.gz";
sha256 = "0gyl0yzfg78sjhbwnwc2g8yn4riwd1wcv183qihgan6z2d5cfbrg";
};
configureFlags = "--enable-shared --disable-static";
meta = {
description = "a Real-Time Transport Protocol (RFC3550) stack under LGPL";
homepage = http://www.linphone.org/index.php/eng/code_review/ortp;
};
}

9
pkgs/development/libraries/ortp/0.13.1.nix → pkgs/development/libraries/ortp/default.nix
View File

@ -1,16 +1,15 @@
args: with args; {stdenv, fetchurl}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ortp-" + version; name = "ortp-0.13.1";
src = fetchurl { src = fetchurl {
url = "mirror://savannah/linphone/ortp/sources/${name}.tar.gz"; url = "mirror://savannah/linphone/ortp/sources/${name}.tar.gz";
sha256 = "0k2963v4b15xnf4cpkpgjhsb8ckxpf6vdr8dnw7z3mzilji7391b"; sha256 = "0k2963v4b15xnf4cpkpgjhsb8ckxpf6vdr8dnw7z3mzilji7391b";
}; };
configureFlags = "--enable-shared --disable-static";
meta = { meta = {
description = "a Real-Time Transport Protocol (RFC3550) stack under LGPL"; description = "A Real-Time Transport Protocol (RFC3550) stack";
homepage = http://www.linphone.org/index.php/eng/code_review/ortp; homepage = http://www.linphone.org/index.php/eng/code_review/ortp;
}; };
} }

2
pkgs/development/libraries/pcre/default.nix
View File

@ -9,7 +9,7 @@ stdenv.mkDerivation {
}; };
configureFlags = '' configureFlags = ''
${if unicodeSupport then "--enable-unicode-properties --enable-shared --disable-static" else ""} ${if unicodeSupport then "--enable-unicode-properties" else ""}
${if !cplusplusSupport then "--disable-cpp" else ""} ${if !cplusplusSupport then "--disable-cpp" else ""}
''; '';

8
pkgs/development/libraries/poppler/default.nix
View File

@ -15,9 +15,11 @@ stdenv.mkDerivation rec {
buildInputs = [pkgconfig zlib glib cairo freetype fontconfig libjpeg gtk] buildInputs = [pkgconfig zlib glib cairo freetype fontconfig libjpeg gtk]
++ (if qt4Support then [qt4] else []); ++ (if qt4Support then [qt4] else []);
configureFlags = "--enable-shared --disable-static --enable-exceptions configureFlags =
--enable-cairo --enable-splash --enable-poppler-glib --enable-zlib ''
--enable-xpdf-headers " --enable-exceptions --enable-cairo --enable-splash
--enable-poppler-glib --enable-zlib --enable-xpdf-headers
''
+ (if qt4Support then "--enable-qt-poppler" else "--disable-qt-poppler"); + (if qt4Support then "--enable-qt-poppler" else "--disable-qt-poppler");
patches = [ ./GDir-const.patch ./use_exceptions.patch ]; patches = [ ./GDir-const.patch ./use_exceptions.patch ];

1
pkgs/development/libraries/readline/readline5.nix
View File

@ -7,6 +7,5 @@ stdenv.mkDerivation {
sha256 = "0icz4hqqq8mlkwrpczyaha94kns0am9z0mh3a2913kg2msb8vs0j"; sha256 = "0icz4hqqq8mlkwrpczyaha94kns0am9z0mh3a2913kg2msb8vs0j";
}; };
propagatedBuildInputs = [ncurses]; propagatedBuildInputs = [ncurses];
configureFlags = "--enable-shared --disable-static";
patches = stdenv.lib.optional stdenv.isDarwin ./shobj-darwin.patch; patches = stdenv.lib.optional stdenv.isDarwin ./shobj-darwin.patch;
} }

1
pkgs/development/libraries/readline/readline6.nix
View File

@ -9,7 +9,6 @@ stdenv.mkDerivation rec {
}; };
propagatedBuildInputs = [ncurses]; propagatedBuildInputs = [ncurses];
configureFlags = "--enable-shared --disable-static";
meta = { meta = {
description = "GNU Readline, a library for interactive line editing"; description = "GNU Readline, a library for interactive line editing";

17
pkgs/development/libraries/redland/default.nix
View File

@ -1,5 +1,5 @@
args: args: with args;
with args;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "redland-1.0.7"; name = "redland-1.0.7";
@ -7,9 +7,14 @@ stdenv.mkDerivation rec {
url = "mirror://sf/librdf/${name}.tar.gz"; url = "mirror://sf/librdf/${name}.tar.gz";
sha256 = "1z160hhrnlyy5c8vh2hjza6kdfmzml8mg9dk8yffifkhnxjq5r2z"; sha256 = "1z160hhrnlyy5c8vh2hjza6kdfmzml8mg9dk8yffifkhnxjq5r2z";
}; };
buildInputs = [pkgconfig]; buildInputs = [pkgconfig];
propagatedBuildInputs = [ bdb openssl libxslt perl mysql postgresql sqlite
curl pcre libxml2]; propagatedBuildInputs = [
configureFlags = "--disable-static --with-threads --with-bdb=${bdb}"; bdb openssl libxslt perl mysql postgresql sqlite curl pcre libxml2
patchPhase="sed -e 1s@/usr@${perl}@ -i utils/touch-mtime.pl"; ];
configureFlags = "--with-threads --with-bdb=${bdb}";
patchPhase = "sed -e 1s@/usr@${perl}@ -i utils/touch-mtime.pl";
} }

2
pkgs/development/libraries/sqlite/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [readline]; buildInputs = [readline];
configureFlags = '' configureFlags = ''
${if static then "--disable-shared --enable-static" else "--disable-static"} ${if static then "--disable-shared --enable-static" else ""}
--with-readline-inc=-I${readline}/include --with-readline-inc=-I${readline}/include
''; '';

3
pkgs/development/libraries/telepathy-gabble/default.nix
View File

@ -1,4 +1,5 @@
args: with args; args: with args;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "telepathy-gabble-0.7.2"; name = "telepathy-gabble-0.7.2";
@ -8,8 +9,8 @@ stdenv.mkDerivation rec {
}; };
propagatedBuildInputs = [telepathy_glib loudmouth]; propagatedBuildInputs = [telepathy_glib loudmouth];
buildInputs = [pkgconfig libxslt]; buildInputs = [pkgconfig libxslt];
configureFlags = "--enable-shared --disable-static";
meta = { meta = {
homepage = http://telepathy.freedesktop.org; homepage = http://telepathy.freedesktop.org;

3
pkgs/development/libraries/telepathy-glib/default.nix
View File

@ -1,4 +1,5 @@
args: with args; args: with args;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "telepathy-glib-0.7.0"; name = "telepathy-glib-0.7.0";
@ -8,8 +9,8 @@ stdenv.mkDerivation rec {
}; };
propagatedBuildInputs = [dbus_glib glib python]; propagatedBuildInputs = [dbus_glib glib python];
buildInputs = [pkgconfig libxslt]; buildInputs = [pkgconfig libxslt];
configureFlags = "--enable-shared --disable-static";
meta = { meta = {
homepage = http://telepathy.freedesktop.org; homepage = http://telepathy.freedesktop.org;

5
pkgs/misc/ghostscript/default.nix
View File

@ -34,10 +34,9 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional x11Support x11 ++ stdenv.lib.optional x11Support x11
++ stdenv.lib.optional cupsSupport cups; ++ stdenv.lib.optional cupsSupport cups;
configureFlags = " configureFlags = ''
--disable-static
${if x11Support then "--with-x" else "--without-x"} ${if x11Support then "--with-x" else "--without-x"}
"; '';
NIX_CFLAGS_COMPILE = "-fpic"; NIX_CFLAGS_COMPILE = "-fpic";

2
pkgs/misc/ntfs-3g/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
--replace /bin/umount ${utillinux}/bin/umount --replace /bin/umount ${utillinux}/bin/umount
''; '';
configureFlags = "--enable-shared --disable-static --disable-ldconfig --exec-prefix=\${prefix} --enable-mount-helper"; configureFlags = "--disable-ldconfig --exec-prefix=\${prefix} --enable-mount-helper";
meta = { meta = {
homepage = http://www.ntfs-3g.org; homepage = http://www.ntfs-3g.org;

2
pkgs/os-specific/linux/libsmbios/default.nix
View File

@ -10,8 +10,6 @@ stdenv.mkDerivation rec {
buildInputs = [libxml2]; buildInputs = [libxml2];
configureFlags = "--disable-static"; # bloated enough as it is...
meta = { meta = {
homepage = http://linux.dell.com/libsmbios/main/index.html; homepage = http://linux.dell.com/libsmbios/main/index.html;
description = "A library to obtain BIOS information"; description = "A library to obtain BIOS information";

2
pkgs/os-specific/linux/pam_console/default.nix
View File

@ -20,8 +20,6 @@ stdenv.mkDerivation {
makeFlags = "LEX=flex"; makeFlags = "LEX=flex";
configureFlags = "--disable-static";
preConfigure = " preConfigure = "
cd pam_console cd pam_console
cp ${configure} configure.ac cp ${configure} configure.ac

2
pkgs/servers/sql/mysql5/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation {
buildInputs = [ps ncurses zlib perl openssl]; buildInputs = [ps ncurses zlib perl openssl];
configureFlags = "--enable-thread-safe-client --disable-static --with-openssl=${openssl} --with-berkeley-db --with-embedded-server" + configureFlags = "--enable-thread-safe-client --with-openssl=${openssl} --with-berkeley-db --with-embedded-server" +
(if stdenv.system == "x86_64-linux" then " --with-lib-ccflags=-fPIC" else ""); (if stdenv.system == "x86_64-linux" then " --with-lib-ccflags=-fPIC" else "");
NIX_CFLAGS_COMPILE = if stdenv.system == "x86_64-linux" then "-fPIC" else ""; NIX_CFLAGS_COMPILE = if stdenv.system == "x86_64-linux" then "-fPIC" else "";

7
pkgs/servers/x11/xorg/builder.sh
View File

@ -1,11 +1,10 @@
# This is the builder for all X11R7 components. # This is the builder for all X.org components.
source $stdenv/setup source $stdenv/setup
# After installation, automatically add all "Requires" fields in the # After installation, automatically add all "Requires" fields in the
# pkgconfig files (*.pc) to the propagated build inputs. # pkgconfig files (*.pc) to the propagated build inputs.
origPostInstall=$postInstall origPostInstall=$postInstall
postInstall=postInstall
postInstall() { postInstall() {
if test -n "$origPostInstall"; then eval "$origPostInstall"; fi if test -n "$origPostInstall"; then eval "$origPostInstall"; fi
@ -17,7 +16,6 @@ postInstall() {
for r in $requires; do for r in $requires; do
for p in $pkgs; do for p in $pkgs; do
# echo $r $p
if test -e $p/lib/pkgconfig/$r.pc; then if test -e $p/lib/pkgconfig/$r.pc; then
echo " found requisite $r in $p" echo " found requisite $r in $p"
propagatedBuildInputs="$propagatedBuildInputs $p" propagatedBuildInputs="$propagatedBuildInputs $p"
@ -30,9 +28,6 @@ postInstall() {
} }
configureFlags="--disable-static $configureFlags"
installFlags="appdefaultdir=$out/share/X11/app-defaults" installFlags="appdefaultdir=$out/share/X11/app-defaults"

13
pkgs/top-level/all-packages.nix
View File

@ -3013,7 +3013,7 @@ let
use_svn = stdenv.system == "x86_64-linux"; use_svn = stdenv.system == "x86_64-linux";
}; };
gettext = composedArgsAndFun (selectVersion ../development/libraries/gettext "0.17") { gettext = import ../development/libraries/gettext {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
@ -3286,7 +3286,7 @@ let
inherit stdenv fetchurl pkgconfig pulseaudio; inherit stdenv fetchurl pkgconfig pulseaudio;
}; };
libarchive = selectVersion ../development/libraries/libarchive "2.4.12" { libarchive = import ../development/libraries/libarchive {
inherit fetchurl stdenv zlib bzip2 e2fsprogs sharutils; inherit fetchurl stdenv zlib bzip2 e2fsprogs sharutils;
}; };
@ -3491,8 +3491,7 @@ let
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
liboil = composedArgsAndFun liboil = import ../development/libraries/liboil {
(selectVersion ../development/libraries/liboil "0.3.15") {
inherit fetchurl stdenv pkgconfig; inherit fetchurl stdenv pkgconfig;
inherit (gtkLibs) glib; inherit (gtkLibs) glib;
}; };
@ -3523,7 +3522,7 @@ let
inherit fetchurl stdenv pkgconfig; inherit fetchurl stdenv pkgconfig;
}; };
libsigsegv = selectVersion ../development/libraries/libsigsegv "2.5" { libsigsegv = import ../development/libraries/libsigsegv/2.5.nix {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
@ -3593,7 +3592,7 @@ let
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
libxklavier = selectVersion ../development/libraries/libxklavier "3.4" { libxklavier = import ../development/libraries/libxklavier {
inherit fetchurl stdenv xkeyboard_config pkgconfig libxml2; inherit fetchurl stdenv xkeyboard_config pkgconfig libxml2;
inherit (xorg) libX11 libICE libxkbfile; inherit (xorg) libX11 libICE libxkbfile;
inherit (gtkLibs) glib; inherit (gtkLibs) glib;
@ -3755,7 +3754,7 @@ let
inherit stdenv perl; inherit stdenv perl;
}; };
ortp = selectVersion ../development/libraries/ortp "0.13.1" { ortp = import ../development/libraries/ortp {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };