From 94d7d1fdbbb80718ff369389c1230ed77a4f7577 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 21 Apr 2009 23:18:09 +0000
Subject: [PATCH] * 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
---
 .../networking/browsers/icecat-3/default.nix  |  1 -
 .../version-management/subversion/1.5.nix     |  2 +-
 .../version-management/subversion/1.6.nix     |  2 +-
 .../development/compilers/strategoxt/0.16.nix |  4 ---
 .../development/compilers/strategoxt/0.17.nix |  8 +----
 .../interpreters/octave/default.nix           |  2 +-
 pkgs/development/interpreters/octave/hg.nix   |  2 +-
 pkgs/development/libraries/a52dec/default.nix |  2 --
 pkgs/development/libraries/avahi/default.nix  |  2 +-
 pkgs/development/libraries/buddy/default.nix  | 15 +++++----
 pkgs/development/libraries/cairo/default.nix  |  2 +-
 .../development/libraries/cairomm/default.nix |  3 +-
 .../libraries/clucene-core/default.nix        | 22 ++++++-------
 .../development/libraries/cppunit/default.nix | 14 ++++----
 .../libraries/dbus-glib/default.nix           | 11 ++++---
 pkgs/development/libraries/dbus/default.nix   |  2 +-
 pkgs/development/libraries/enchant/1.3.0.nix  |  6 ++--
 pkgs/development/libraries/exiv2/default.nix  |  2 +-
 pkgs/development/libraries/faad2/default.nix  |  2 --
 pkgs/development/libraries/ffmpeg/default.nix |  2 --
 pkgs/development/libraries/gamin/default.nix  | 20 ++++++------
 pkgs/development/libraries/gettext/0.14.6.nix |  9 ------
 pkgs/development/libraries/gettext/0.15.nix   |  9 ------
 pkgs/development/libraries/gettext/0.16.x.nix |  9 ------
 .../gettext/{0.17.nix => default.nix}         |  9 ++++--
 pkgs/development/libraries/gsl/default.nix    |  2 --
 .../libraries/gstreamer/gnonlin/default.nix   | 29 ++++++++---------
 .../gstreamer/gst-ffmpeg/default.nix          | 32 +++++++++----------
 .../gstreamer/gst-plugins-base/default.nix    |  2 --
 .../gstreamer/gst-plugins-good/default.nix    |  2 +-
 .../libraries/gstreamer/gstreamer/default.nix |  5 +--
 pkgs/development/libraries/id3lib/default.nix |  2 +-
 pkgs/development/libraries/ilbc/default.nix   |  3 +-
 .../development/libraries/ilmbase/default.nix | 15 +++++----
 .../development/libraries/indilib/default.nix |  1 -
 pkgs/development/libraries/jasper/default.nix |  2 --
 .../libraries/kerberos/heimdal.nix            | 22 +++++++------
 .../libraries/libarchive/2.4.11.nix           |  2 --
 .../libraries/libarchive/2.4.12.nix           |  2 --
 .../libraries/libarchive/common.nix           | 18 -----------
 .../libraries/libarchive/default.nix          | 19 +++++++++++
 pkgs/development/libraries/libidn/default.nix |  2 --
 .../development/libraries/libksba/default.nix |  2 --
 .../development/libraries/libnova/default.nix | 24 +++++++-------
 pkgs/development/libraries/liboil/0.3.13.nix  | 19 -----------
 .../liboil/{0.3.15.nix => default.nix}        |  6 ++--
 pkgs/development/libraries/libsigsegv/2.5.nix |  4 +--
 .../libraries/libunwind/default.nix           |  2 --
 .../libxklavier/{3.4.nix => default.nix}      |  9 ++++--
 pkgs/development/libraries/libzip/default.nix | 25 ++++++++-------
 .../libraries/loudmouth/default.nix           |  3 +-
 pkgs/development/libraries/lzo/default.nix    |  2 --
 .../mediastreamer/2.2.0-cvs20080207.nix       |  2 +-
 .../libraries/mpeg2dec/default.nix            |  2 --
 pkgs/development/libraries/neon/0.26.nix      |  1 -
 .../libraries/openbabel/default.nix           |  9 +++---
 .../development/libraries/openexr/default.nix |  2 +-
 .../libraries/openldap/default.nix            |  2 --
 pkgs/development/libraries/ortp/0.7.1.nix     | 16 ----------
 .../ortp/{0.13.1.nix => default.nix}          |  9 +++---
 pkgs/development/libraries/pcre/default.nix   |  2 +-
 .../development/libraries/poppler/default.nix |  8 +++--
 .../libraries/readline/readline5.nix          |  1 -
 .../libraries/readline/readline6.nix          |  3 +-
 .../development/libraries/redland/default.nix | 17 ++++++----
 pkgs/development/libraries/sqlite/default.nix |  2 +-
 .../libraries/telepathy-gabble/default.nix    | 25 ++++++++-------
 .../libraries/telepathy-glib/default.nix      | 25 ++++++++-------
 pkgs/misc/ghostscript/default.nix             |  5 ++-
 pkgs/misc/ntfs-3g/default.nix                 |  2 +-
 pkgs/os-specific/linux/libsmbios/default.nix  |  2 --
 .../os-specific/linux/pam_console/default.nix |  2 --
 pkgs/servers/sql/mysql5/default.nix           |  2 +-
 pkgs/servers/x11/xorg/builder.sh              |  7 +---
 pkgs/top-level/all-packages.nix               | 13 ++++----
 75 files changed, 241 insertions(+), 336 deletions(-)
 delete mode 100644 pkgs/development/libraries/gettext/0.14.6.nix
 delete mode 100644 pkgs/development/libraries/gettext/0.15.nix
 delete mode 100644 pkgs/development/libraries/gettext/0.16.x.nix
 rename pkgs/development/libraries/gettext/{0.17.nix => default.nix} (58%)
 delete mode 100644 pkgs/development/libraries/libarchive/2.4.11.nix
 delete mode 100644 pkgs/development/libraries/libarchive/2.4.12.nix
 delete mode 100644 pkgs/development/libraries/libarchive/common.nix
 create mode 100644 pkgs/development/libraries/libarchive/default.nix
 delete mode 100644 pkgs/development/libraries/liboil/0.3.13.nix
 rename pkgs/development/libraries/liboil/{0.3.15.nix => default.nix} (77%)
 rename pkgs/development/libraries/libxklavier/{3.4.nix => default.nix} (80%)
 delete mode 100644 pkgs/development/libraries/ortp/0.7.1.nix
 rename pkgs/development/libraries/ortp/{0.13.1.nix => default.nix} (60%)

diff --git a/pkgs/applications/networking/browsers/icecat-3/default.nix b/pkgs/applications/networking/browsers/icecat-3/default.nix
index a525ef5b774e..69c0c94cc6aa 100644
--- a/pkgs/applications/networking/browsers/icecat-3/default.nix
+++ b/pkgs/applications/networking/browsers/icecat-3/default.nix
@@ -29,7 +29,6 @@ stdenv.mkDerivation {
 
     "--enable-optimize"
     "--disable-debug"
-    "--disable-static"  # needed for `libxul'
     "--enable-strip"
     "--with-system-jpeg"
     "--with-system-zlib"
diff --git a/pkgs/applications/version-management/subversion/1.5.nix b/pkgs/applications/version-management/subversion/1.5.nix
index 1cf1b6e915fd..e2b85bf1d49a 100644
--- a/pkgs/applications/version-management/subversion/1.5.nix
+++ b/pkgs/applications/version-management/subversion/1.5.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = ''
     --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 httpServer then "--with-apxs=${httpd}/bin/apxs" else "--without-apxs"}
     ${if pythonBindings || perlBindings then "--with-swig=${swig}" else "--without-swig"}
diff --git a/pkgs/applications/version-management/subversion/1.6.nix b/pkgs/applications/version-management/subversion/1.6.nix
index b2ee89232f13..6d40142c4bc1 100644
--- a/pkgs/applications/version-management/subversion/1.6.nix
+++ b/pkgs/applications/version-management/subversion/1.6.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = ''
     --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 httpServer then "--with-apxs=${httpd}/bin/apxs" else "--without-apxs"}
     ${if pythonBindings || perlBindings then "--with-swig=${swig}" else "--without-swig"}
diff --git a/pkgs/development/compilers/strategoxt/0.16.nix b/pkgs/development/compilers/strategoxt/0.16.nix
index 5795787c06a7..4cfa2c798920 100644
--- a/pkgs/development/compilers/strategoxt/0.16.nix
+++ b/pkgs/development/compilers/strategoxt/0.16.nix
@@ -20,8 +20,6 @@ rec {
         --replace getopt ${getopt}/bin/getopt
     '';
 
-    configureFlags = "--disable-static";
-
     meta = {
       homepage = http://www.program-transformation.org/Sdf/SdfBundle;
       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];
 
-    configureFlags = "--disable-static";
-
     meta = {
       homepage = http://strategoxt.org/;
       meta = "A language and toolset for program transformation";
diff --git a/pkgs/development/compilers/strategoxt/0.17.nix b/pkgs/development/compilers/strategoxt/0.17.nix
index 7bc045fd64c4..cfd8b8e60972 100644
--- a/pkgs/development/compilers/strategoxt/0.17.nix
+++ b/pkgs/development/compilers/strategoxt/0.17.nix
@@ -20,8 +20,6 @@ rec {
         --replace getopt ${getopt}/bin/getopt
     '';
 
-    configureFlags = "--disable-static";
-
     meta = {
       homepage = http://www.program-transformation.org/Sdf/SdfBundle;
       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];
 
-    configureFlags = "--disable-static";
-
     meta = {
       homepage = http://strategoxt.org/;
       meta = "A language and toolset for program transformation";
@@ -60,7 +56,7 @@ rec {
 
     # !!! The explicit `--with-strategoxt' is necessary; otherwise we
     # 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 = {
       homepage = http://strategoxt.org/Stratego/JavaFront;
@@ -79,8 +75,6 @@ rec {
 
     buildInputs = [jdk pkgconfig aterm sdf strategoxt javafront];
 
-    configureFlags = "--disable-static";
-
     meta = {
       homepage = http://strategoxt.org/Stratego/TheDryad;
       meta = "A collection of tools for developing transformation systems for Java source and bytecode";
diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index 703028064ff2..6747ef9565b7 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -7,5 +7,5 @@ stdenv.mkDerivation {
     sha256 = "1rkpzig0r0zrm73avxgai0zqkz9hv4js57i1xxdzcm22qw22szaj";
   };
   buildInputs = [gfortran readline ncurses perl flex texinfo qhull];
-  configureFlags = "--enable-readline --enable-dl --disable-static --enable-shared";
+  configureFlags = "--enable-readline --enable-dl";
 }
diff --git a/pkgs/development/interpreters/octave/hg.nix b/pkgs/development/interpreters/octave/hg.nix
index 4d31cc84efcd..a1c6af84e2bb 100644
--- a/pkgs/development/interpreters/octave/hg.nix
+++ b/pkgs/development/interpreters/octave/hg.nix
@@ -5,7 +5,7 @@ let commonBuildInputs = [gfortran readline ncurses perl glibc qhull libX11 texin
 
 stdenv.mkDerivation ({
   NIX_LDFLAGS = "-lpthread";
-  configureFlags = "--enable-readline --enable-dl --disable-static --enable-shared";
+  configureFlags = "--enable-readline --enable-dl";
   meta = { 
       description = "High-level interactive language for numerical computations";
       homepage = http://www.octave.org;
diff --git a/pkgs/development/libraries/a52dec/default.nix b/pkgs/development/libraries/a52dec/default.nix
index 8fb0d4c527d8..82fef49cfc10 100644
--- a/pkgs/development/libraries/a52dec/default.nix
+++ b/pkgs/development/libraries/a52dec/default.nix
@@ -8,8 +8,6 @@ stdenv.mkDerivation rec {
     sha256 = "0czccp4fcpf2ykp16xcrzdfmnircz1ynhls334q374xknd5747d2";
   };
 
-  configureFlags = "--enable-shared --disable-static";
-
   NIX_CFLAGS_COMPILE = "-fpic";
 
   meta = {
diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix
index 89e1104f3d81..cca6095616ba 100644
--- a/pkgs/development/libraries/avahi/default.nix
+++ b/pkgs/development/libraries/avahi/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   configureFlags = ''
     --disable-qt3 --disable-gdbm --disable-gtk --disable-mono
     --${if qt4Support then "enable" else "disable"}-qt4
-    --with-distro=none --enable-shared --disable-static --disable-python
+    --with-distro=none --disable-python
   '';
 
   meta = {
diff --git a/pkgs/development/libraries/buddy/default.nix b/pkgs/development/libraries/buddy/default.nix
index 52bbb2f4df3a..16db4290ec0d 100644
--- a/pkgs/development/libraries/buddy/default.nix
+++ b/pkgs/development/libraries/buddy/default.nix
@@ -1,19 +1,20 @@
 { stdenv, fetchurl }:
 
-stdenv.mkDerivation rec
-{
+stdenv.mkDerivation rec {
   name = "buddy-2.4";
-  meta =
-  {
+  
+  meta = {
     homepage = "http://sourceforge.net/projects/buddy/";
     description = "binary decision diagram package";
     license = "as-is";
   };
-  src = fetchurl
-  {
+  
+  src = fetchurl {
     url = "mirror://sourceforge/buddy/${name}.tar.gz";
     sha256 = "0dl86l9xkl33wnkz684xa9axhcxx2zzi4q5lii0axnb9lsk81pyk";
   };
-  configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3 --disable-static";
+  
+  configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3";
+  
   doCheck = true;
 }
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index a9c929c3d59e..6ca2ce07670d 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     stdenv.lib.optional postscriptSupport zlib ++
     stdenv.lib.optional pngSupport libpng;
     
-  configureFlags = ["--disable-static" "--enable-xcb"] ++
+  configureFlags = ["--enable-xcb"] ++
     stdenv.lib.optional pdfSupport "--enable-pdf";
 
   preConfigure = ''
diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix
index 712a5068a995..c30f64b0a9b1 100644
--- a/pkgs/development/libraries/cairomm/default.nix
+++ b/pkgs/development/libraries/cairomm/default.nix
@@ -9,10 +9,9 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [pkgconfig];
+  
   propagatedBuildInputs = [ cairo x11 fontconfig freetype libsigcxx ];
 
-  configureFlags = "--enable-shared --disable-static";
-
   meta = {
     description = "A 2D graphics library with support for multiple output devices";
 
diff --git a/pkgs/development/libraries/clucene-core/default.nix b/pkgs/development/libraries/clucene-core/default.nix
index 24e133a5de3c..4fcb11677dae 100644
--- a/pkgs/development/libraries/clucene-core/default.nix
+++ b/pkgs/development/libraries/clucene-core/default.nix
@@ -1,15 +1,15 @@
 args: with args;
+
 stdenv.mkDerivation rec {
-	name = "clucene-core-0.9.20";
+  name = "clucene-core-0.9.20";
 
-	src = fetchurl {
-		url = "mirror://sf/clucene/${name}.tar.bz2";
-		sha256 = "1hwq3b4qp1dgygmypgpg3blj68wnksq2rbqkwyxvl5dldn12q7rg";
-	};
-	configureFlags = "--disable-static";
-
-	meta = {
-		description = "CLucene is a port of the very popular Java Lucene text search engine API. Core package.";
-		homepage = http://clucene.sourceforge.net;
-	};
+  src = fetchurl {
+    url = "mirror://sf/clucene/${name}.tar.bz2";
+    sha256 = "1hwq3b4qp1dgygmypgpg3blj68wnksq2rbqkwyxvl5dldn12q7rg";
+  };
+  
+  meta = {
+    description = "CLucene is a port of the very popular Java Lucene text search engine API. Core package.";
+    homepage = http://clucene.sourceforge.net;
+  };
 }
diff --git a/pkgs/development/libraries/cppunit/default.nix b/pkgs/development/libraries/cppunit/default.nix
index 6654aa77c9fa..5e55bd51bcdc 100644
--- a/pkgs/development/libraries/cppunit/default.nix
+++ b/pkgs/development/libraries/cppunit/default.nix
@@ -1,10 +1,10 @@
-args: with args;
+{stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-	name = "cppunit-1.12.0";
-	src = fetchurl {
-		url = mirror://sf/cppunit/cppunit-1.12.0.tar.gz;
-		sha256 = "07zyyx5dyai94y8r8va28971f5mw84mb93xx9pm6m4ddpj6c79cq";
-	};
-	configureFlags = "--enable-shared --disable-static";
+  name = "cppunit-1.12.0";
+  
+  src = fetchurl {
+    url = mirror://sf/cppunit/cppunit-1.12.0.tar.gz;
+    sha256 = "07zyyx5dyai94y8r8va28971f5mw84mb93xx9pm6m4ddpj6c79cq";
+  };
 }
diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix
index 9a9851521b47..bcc2ba1d3144 100644
--- a/pkgs/development/libraries/dbus-glib/default.nix
+++ b/pkgs/development/libraries/dbus-glib/default.nix
@@ -2,18 +2,21 @@ args: with args;
 
 stdenv.mkDerivation rec {
   name = "dbus-glib-0.74";
+  
   src = fetchurl {
     url = "${meta.homepage}/releases/dbus-glib/${name}.tar.gz";
     sha256 = "1qmbnd9xgg7vahlfywd8sfd9yqhx8jdyczz3cshfsd4qc76xhw78";
   };
+  
   buildInputs = [pkgconfig expat gettext];
+  
   propagatedBuildInputs = [dbus.libs glib];
-  configureFlags = "--enable-shared --disable-static";
+  
   passthru = { inherit dbus glib; };
 
   meta = {
-	  homepage = http://dbus.freedesktop.org;
-	  license = "AFL-2.1 or GPL-2";
-	  description = "GLib bindings for D-Bus lightweight IPC mechanism";
+    homepage = http://dbus.freedesktop.org;
+    license = "AFL-2.1 or GPL-2";
+    description = "GLib bindings for D-Bus lightweight IPC mechanism";
   };
 }
diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index 182f6e92b11c..4fe742868073 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -8,7 +8,7 @@ let
     sha256 = "1f7v79ws34mh6j75fk6w4w9v441vffll0fwf5vk94mwa0bc28g5b";
   };
   
-  configureFlags = "--disable-static --localstatedir=/var --with-session-socket-dir=/tmp";
+  configureFlags = "--localstatedir=/var --with-session-socket-dir=/tmp";
   
 in rec {
 
diff --git a/pkgs/development/libraries/enchant/1.3.0.nix b/pkgs/development/libraries/enchant/1.3.0.nix
index e503366087eb..0e3f92881e90 100644
--- a/pkgs/development/libraries/enchant/1.3.0.nix
+++ b/pkgs/development/libraries/enchant/1.3.0.nix
@@ -1,13 +1,15 @@
 args: with args;
+
 stdenv.mkDerivation rec {
   name = "enchant-" + version;
+  
   src = fetchurl {
     url = "http://www.abisource.com/downloads/enchant/${version}/${name}.tar.gz";
     sha256 = "1vwqwsadnp4rf8wj7d4rglvszjzlcli0jyxh06h8inka1sm1al76";
   };
+  
   buildInputs = [aspell pkgconfig glib];
-  configureFlags = "--enable-shared --disable-static";
-
+  
   meta = {
     homepage = http://www.abisource.com/enchant;
   };
diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix
index 896af5e65401..676f021a7209 100644
--- a/pkgs/development/libraries/exiv2/default.nix
+++ b/pkgs/development/libraries/exiv2/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   
   buildInputs = [zlib];
   
-  configureFlags = "--with-zlib=${zlib} --enable-shared --disable-static --disable-xmp";
+  configureFlags = "--with-zlib=${zlib} --disable-xmp";
 
   meta = {
     homepage = http://www.exiv2.org/;
diff --git a/pkgs/development/libraries/faad2/default.nix b/pkgs/development/libraries/faad2/default.nix
index 733724f2a42f..fc489f9eb665 100644
--- a/pkgs/development/libraries/faad2/default.nix
+++ b/pkgs/development/libraries/faad2/default.nix
@@ -8,8 +8,6 @@ stdenv.mkDerivation {
     sha256 = "1db37ydb6mxhshbayvirm5vz6j361bjim4nkpwjyhmy4ddfinmhl";
   };
 
-  configureFlags = "--disable-static";
-
   meta = {
     description = "An open source MPEG-4 and MPEG-2 AAC decoder";
     homepage = http://www.audiocoding.com/faad2.html;
diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix
index 33f003095a67..b37d3e458818 100644
--- a/pkgs/development/libraries/ffmpeg/default.nix
+++ b/pkgs/development/libraries/ffmpeg/default.nix
@@ -12,8 +12,6 @@ stdenv.mkDerivation {
   # the resulting library is GPL'ed, so it can only be used in GPL'ed
   # applications.
   configureFlags = ''
-    --enable-shared
-    --disable-static
     --enable-gpl
     --enable-postproc
     --enable-swscale
diff --git a/pkgs/development/libraries/gamin/default.nix b/pkgs/development/libraries/gamin/default.nix
index f8c44fc0a08b..79356b31b7e7 100644
--- a/pkgs/development/libraries/gamin/default.nix
+++ b/pkgs/development/libraries/gamin/default.nix
@@ -1,16 +1,16 @@
 args: with args;
+
 stdenv.mkDerivation rec {
-	name = "gamin-0.1.9";
+  name = "gamin-0.1.9";
 
-	src = fetchurl {
-		url = "http://www.gnome.org/~veillard/gamin/sources/${name}.tar.gz";
-		sha256 = "0fgjfyr0nlkpdxj94a4qfm82wypljdyv1b6l56v7i9jdx0hcdqhr";
-	};
+  src = fetchurl {
+    url = "http://www.gnome.org/~veillard/gamin/sources/${name}.tar.gz";
+    sha256 = "0fgjfyr0nlkpdxj94a4qfm82wypljdyv1b6l56v7i9jdx0hcdqhr";
+  };
 
-	buildInputs = [python pkgconfig glib];
+  buildInputs = [python pkgconfig glib];
 
-        # `_GNU_SOURCE' is needed, e.g., to get `struct ucred' from
-        # <sys/socket.h> with Glibc 2.9.
-	configureFlags = "--enable-shared --disable-static --disable-debug"
-          + " --with-python=${python} CPPFLAGS=-D_GNU_SOURCE";
+  # `_GNU_SOURCE' is needed, e.g., to get `struct ucred' from
+  # <sys/socket.h> with Glibc 2.9.
+  configureFlags = "--disable-debug --with-python=${python} CPPFLAGS=-D_GNU_SOURCE";
 }
diff --git a/pkgs/development/libraries/gettext/0.14.6.nix b/pkgs/development/libraries/gettext/0.14.6.nix
deleted file mode 100644
index bceacd318ec6..000000000000
--- a/pkgs/development/libraries/gettext/0.14.6.nix
+++ /dev/null
@@ -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";
-}
diff --git a/pkgs/development/libraries/gettext/0.15.nix b/pkgs/development/libraries/gettext/0.15.nix
deleted file mode 100644
index 0c417aafe50f..000000000000
--- a/pkgs/development/libraries/gettext/0.15.nix
+++ /dev/null
@@ -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";
-}
diff --git a/pkgs/development/libraries/gettext/0.16.x.nix b/pkgs/development/libraries/gettext/0.16.x.nix
deleted file mode 100644
index d9b8cabef1da..000000000000
--- a/pkgs/development/libraries/gettext/0.16.x.nix
+++ /dev/null
@@ -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";
-}
diff --git a/pkgs/development/libraries/gettext/0.17.nix b/pkgs/development/libraries/gettext/default.nix
similarity index 58%
rename from pkgs/development/libraries/gettext/0.17.nix
rename to pkgs/development/libraries/gettext/default.nix
index 5fc60d9b8a6f..2c76e7deb077 100644
--- a/pkgs/development/libraries/gettext/0.17.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -1,9 +1,12 @@
-args: with args;
+{stdenv, fetchurl}:
+
 stdenv.mkDerivation rec {
-  name = "gettext-" + version;
+  name = "gettext-0.17";
+  
   src = fetchurl {
     url = "mirror://gnu/gettext/${name}.tar.gz";
     sha256 = "1fipjpaxxwifdw6cbr7mkxp1yvy643i38nhlh7124bqnisxki5i0";
   };
-  configureFlags = "--disable-csharp --enable-shared --disable-static";
+  
+  configureFlags = "--disable-csharp";
 }
diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix
index 71c4ddcdad80..195d10a49202 100644
--- a/pkgs/development/libraries/gsl/default.nix
+++ b/pkgs/development/libraries/gsl/default.nix
@@ -10,8 +10,6 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  configureFlags = "--disable-static";
-
   meta = { 
     description = "The GNU Scientific Library, a large numerical library";
 
diff --git a/pkgs/development/libraries/gstreamer/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/gnonlin/default.nix
index 4dd8db4e18c3..b295d2d31988 100644
--- a/pkgs/development/libraries/gstreamer/gnonlin/default.nix
+++ b/pkgs/development/libraries/gstreamer/gnonlin/default.nix
@@ -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+";
+  };
+}
diff --git a/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix b/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix
index 6ec9acf0e9bc..2ea82bc7bdcb 100644
--- a/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix
+++ b/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix
@@ -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+";
+  };
+}
diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix
index 4c09b46ccd34..43fd458eed9f 100644
--- a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix
+++ b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix
@@ -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];
diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix
index 2574cfcb417e..b575c2536a14 100644
--- a/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix
+++ b/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix
@@ -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;
diff --git a/pkgs/development/libraries/gstreamer/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/gstreamer/default.nix
index 27d7ba11bb57..213c3d9f9225 100644
--- a/pkgs/development/libraries/gstreamer/gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/gstreamer/default.nix
@@ -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;
diff --git a/pkgs/development/libraries/id3lib/default.nix b/pkgs/development/libraries/id3lib/default.nix
index 9d015d139231..edbf23d516e0 100644
--- a/pkgs/development/libraries/id3lib/default.nix
+++ b/pkgs/development/libraries/id3lib/default.nix
@@ -2,9 +2,9 @@
 
 stdenv.mkDerivation {
   name = "id3lib-3.8.3";
+  
   src = fetchurl {
     url = mirror://sourceforge/id3lib/id3lib-3.8.3.tar.gz;
     md5 = "19f27ddd2dda4b2d26a559a4f0f402a7";
   };
-  configureFlags = "--disable-static";
 }
diff --git a/pkgs/development/libraries/ilbc/default.nix b/pkgs/development/libraries/ilbc/default.nix
index 360644cf9116..36b74a1980e0 100644
--- a/pkgs/development/libraries/ilbc/default.nix
+++ b/pkgs/development/libraries/ilbc/default.nix
@@ -1,4 +1,5 @@
 args: with args;
+
 stdenv.mkDerivation {
   name = "ilbc-rfc3951";
 
@@ -12,6 +13,4 @@ stdenv.mkDerivation {
     phases = "unpackPhase installPhase";
     installPhase = "cp ilbc-rfc3951.tar.gz \${out}";
   };
-
-  configureFlags = "--enable-shared --disable-static";
 }
diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix
index 0ab548bef86d..2b7952d3b209 100644
--- a/pkgs/development/libraries/ilmbase/default.nix
+++ b/pkgs/development/libraries/ilmbase/default.nix
@@ -1,9 +1,10 @@
-args: with args;
+{stdenv, fetchurl}:
+
 stdenv.mkDerivation {
-	name = "ilmbase-1.0.1";
-	src = fetchurl {
-		url = http://download.savannah.nongnu.org/releases/openexr/ilmbase-1.0.1.tar.gz;
-		sha256 = "0z9r3r0bxyhgwhkdwln0dg1lnxz691qnjygrqlg3jym34rxzq52g";
-	};
-	configureFlags = "--enable-shared --disable-static";
+  name = "ilmbase-1.0.1";
+  
+  src = fetchurl {
+    url = http://download.savannah.nongnu.org/releases/openexr/ilmbase-1.0.1.tar.gz;
+    sha256 = "0z9r3r0bxyhgwhkdwln0dg1lnxz691qnjygrqlg3jym34rxzq52g";
+  };
 }
diff --git a/pkgs/development/libraries/indilib/default.nix b/pkgs/development/libraries/indilib/default.nix
index 651cb6309449..4c7cbb4e6916 100644
--- a/pkgs/development/libraries/indilib/default.nix
+++ b/pkgs/development/libraries/indilib/default.nix
@@ -8,7 +8,6 @@ stdenv.mkDerivation {
   };
 
   propagatedBuildInputs = [cfitsio libusb zlib];
-  configureFlags = "--enable-shared --disable-static";
 
   meta = {
     homepage = http://indi.sf.net;
diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix
index cf91952534c4..b5c3ec6b97b3 100644
--- a/pkgs/development/libraries/jasper/default.nix
+++ b/pkgs/development/libraries/jasper/default.nix
@@ -10,8 +10,6 @@ stdenv.mkDerivation rec {
 
   buildInputs = [unzip libjpeg];
   
-  configureFlags = "--enable-shared --disable-static";
-
   meta = {
     homepage = http://www.ece.uvic.ca/~mdadams/jasper/;
     description = "JasPer JPEG2000 Library";
diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix
index e4800dfb94ba..9f7305f2d3e8 100644
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -1,14 +1,18 @@
 args: with args;
+
 stdenv.mkDerivation rec {
-	name = "heimdal-1.0.2";
+  name = "heimdal-1.0.2";
 
-	src = fetchurl {
-		urls = [ "http://www.h5l.org/dist/src/${name}.tar.gz"
-                         "http://ftp.pdc.kth.se/pub/heimdal/src/${name}.tar.gz" ];
-		sha256 = "1h4x41lpv2abpv5l3yjd58pfzs0kkp5sbnih9iykhwd6sii1iig5";
-	};
+  src = fetchurl {
+    urls = [
+      "http://www.h5l.org/dist/src/${name}.tar.gz"
+      "http://ftp.pdc.kth.se/pub/heimdal/src/${name}.tar.gz"
+    ];
+    sha256 = "1h4x41lpv2abpv5l3yjd58pfzs0kkp5sbnih9iykhwd6sii1iig5";
+  };
 
-	## ugly, X should be made an option
-	configureFlags = "--enable-shared --disable-static --with-openldap=${openldap} --without-x";
-	propagatedBuildInputs = [ readline db4 openssl openldap cyrus_sasl ];
+  ## ugly, X should be made an option
+  configureFlags = "--with-openldap=${openldap} --without-x";
+  
+  propagatedBuildInputs = [ readline db4 openssl openldap cyrus_sasl ];
 }
diff --git a/pkgs/development/libraries/libarchive/2.4.11.nix b/pkgs/development/libraries/libarchive/2.4.11.nix
deleted file mode 100644
index e75d59ec18af..000000000000
--- a/pkgs/development/libraries/libarchive/2.4.11.nix
+++ /dev/null
@@ -1,2 +0,0 @@
-args:
-import ./common.nix "1iq5hs4hbqyl6sqiqlaj3j89vpfqx6zv974c965nxjvmwy816dbz" args
diff --git a/pkgs/development/libraries/libarchive/2.4.12.nix b/pkgs/development/libraries/libarchive/2.4.12.nix
deleted file mode 100644
index 9765ec61cd76..000000000000
--- a/pkgs/development/libraries/libarchive/2.4.12.nix
+++ /dev/null
@@ -1,2 +0,0 @@
-args:
-import ./common.nix "133kxx1wfangrhy6rcpqlqib7i45qxj8pcp3i9n574cwfx41swy4" args
diff --git a/pkgs/development/libraries/libarchive/common.nix b/pkgs/development/libraries/libarchive/common.nix
deleted file mode 100644
index 9f031e4f2c21..000000000000
--- a/pkgs/development/libraries/libarchive/common.nix
+++ /dev/null
@@ -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;
-	};
-}
diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix
new file mode 100644
index 000000000000..744554c338f6
--- /dev/null
+++ b/pkgs/development/libraries/libarchive/default.nix
@@ -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;
+  };
+}
diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix
index 11e49acad145..10bb8966222e 100644
--- a/pkgs/development/libraries/libidn/default.nix
+++ b/pkgs/development/libraries/libidn/default.nix
@@ -8,8 +8,6 @@ stdenv.mkDerivation rec {
     sha256 = "07p7cnmfnq7ds8a56iqmxps46bzznn92xxpdlnnp3n6pwcnidmn7";
   };
 
-  configureFlags = "--disable-static";
-
   doCheck = true;
 
   meta = {
diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix
index 5ff99341da14..513afc474ea0 100644
--- a/pkgs/development/libraries/libksba/default.nix
+++ b/pkgs/development/libraries/libksba/default.nix
@@ -10,8 +10,6 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [libgpgerror];
 
-  configureFlags = "--enable-shared --disable-static";
-
   meta = {
     homepage = http://www.gnupg.org;
     description = "Libksba is a CMS and X.509 access library under development";
diff --git a/pkgs/development/libraries/libnova/default.nix b/pkgs/development/libraries/libnova/default.nix
index 805a1f444520..e2d1c25d013d 100644
--- a/pkgs/development/libraries/libnova/default.nix
+++ b/pkgs/development/libraries/libnova/default.nix
@@ -1,15 +1,15 @@
 args: with args;
-stdenv.mkDerivation rec {
-	name = "libnova-0.12.1";
-	
-	src = fetchurl {
-		url = "mirror://sf/libnova/${name}.tar.gz";
-		sha256 = "0bs6c45q4qkrns36qndl8vns5gvhgpd90hi68bhah4r4hrg48lw0";
-	};
-	configureFlags = "--enable-shared --disable-static";
 
-	meta = {
-		description = "Celestial Mechanics, Astrometry and Astrodynamics Library";
-		homepage = http://libnova.sf.net;
-	};
+stdenv.mkDerivation rec {
+  name = "libnova-0.12.1";
+	
+  src = fetchurl {
+    url = "mirror://sf/libnova/${name}.tar.gz";
+    sha256 = "0bs6c45q4qkrns36qndl8vns5gvhgpd90hi68bhah4r4hrg48lw0";
+  };
+  
+  meta = {
+    description = "Celestial Mechanics, Astrometry and Astrodynamics Library";
+    homepage = http://libnova.sf.net;
+  };
 }
diff --git a/pkgs/development/libraries/liboil/0.3.13.nix b/pkgs/development/libraries/liboil/0.3.13.nix
deleted file mode 100644
index b1425e454fbc..000000000000
--- a/pkgs/development/libraries/liboil/0.3.13.nix
+++ /dev/null
@@ -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";
-  };
-}
diff --git a/pkgs/development/libraries/liboil/0.3.15.nix b/pkgs/development/libraries/liboil/default.nix
similarity index 77%
rename from pkgs/development/libraries/liboil/0.3.15.nix
rename to pkgs/development/libraries/liboil/default.nix
index b777a1195f92..1bfbb6bbff27 100644
--- a/pkgs/development/libraries/liboil/0.3.15.nix
+++ b/pkgs/development/libraries/liboil/default.nix
@@ -1,15 +1,13 @@
-args: with args;
+{stdenv, fetchurl, pkgconfig, glib}:
 
 stdenv.mkDerivation rec {
-  name = "liboil-" + version;
+  name = "liboil-0.3.15";
 
   src = fetchurl {
     url = "${meta.homepage}/download/${name}.tar.gz";
     sha256 = "1m3zcl54sf21cf2ckzny16ihymz8whi60ymyrhmd3m1dlw1knpmf";
   };
 
-  configureFlags = "--enable-shared --disable-static";
-
   buildInputs = [pkgconfig glib];
 
   meta = {
diff --git a/pkgs/development/libraries/libsigsegv/2.5.nix b/pkgs/development/libraries/libsigsegv/2.5.nix
index af8bd2258201..9dd50c37c613 100644
--- a/pkgs/development/libraries/libsigsegv/2.5.nix
+++ b/pkgs/development/libraries/libsigsegv/2.5.nix
@@ -1,7 +1,8 @@
 args: with args;
 
 stdenv.mkDerivation rec {
-  name = "libsigsegv-" + version;
+  name = "libsigsegv-2.5";
+  
   src = fetchurl {
     url = "mirror://gnu/libsigsegv/${name}.tar.gz";
     sha256 = "0fvcsq9msi63vrbpvks6mqkrnls5cfy6bzww063sqhk2h49vsyyg";
@@ -12,6 +13,5 @@ stdenv.mkDerivation rec {
     description = "A library for handling page faults in user mode";
   };
 
-  configureFlags = "--enable-shared --disable-static";
   doCheck = true;
 }
diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix
index a7dad9d55895..ea657e8e43d8 100644
--- a/pkgs/development/libraries/libunwind/default.nix
+++ b/pkgs/development/libraries/libunwind/default.nix
@@ -8,8 +8,6 @@ stdenv.mkDerivation rec {
     sha256 = "1qfxqkyx4r5dmwajyhvsyyl8zwxs6n2rcg7a61fgfdfp0gxvpzgx";
   };
   
-  configureFlags = "--enable-shared --disable-static";
-
   NIX_CFLAGS_COMPILE = if stdenv.system == "x86_64-linux" then "-fPIC" else "";
   
   meta = {
diff --git a/pkgs/development/libraries/libxklavier/3.4.nix b/pkgs/development/libraries/libxklavier/default.nix
similarity index 80%
rename from pkgs/development/libraries/libxklavier/3.4.nix
rename to pkgs/development/libraries/libxklavier/default.nix
index 38fa91cfeb08..973d62467143 100644
--- a/pkgs/development/libraries/libxklavier/3.4.nix
+++ b/pkgs/development/libraries/libxklavier/default.nix
@@ -1,7 +1,7 @@
 args: with args;
 
 stdenv.mkDerivation rec {
-  name = "libxklavier-" + version;
+  name = "libxklavier-3.4";
 
   src = fetchurl {
     url = "mirror://sf/gswitchit/${name}.tar.gz";
@@ -10,10 +10,13 @@ stdenv.mkDerivation rec {
 
 # TODO: enable xmodmap support, needs xmodmap DB
   propagatedBuildInputs = [libX11 xkeyboard_config libxml2 libICE glib libxkbfile];
+  
   buildInputs = [pkgconfig];
-  configureFlags = "--enable-shared --disable-static
+  
+  configureFlags = ''
     --with-xkb-base=${xkeyboard_config}/etc/X11/xkb
-    --disable-xmodmap-support";
+    --disable-xmodmap-support
+  '';
 
   meta = {
     homepage = http://freedesktop.org/wiki/Software/LibXklavier;
diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix
index 2a5507ef0068..0c2e13c5615a 100644
--- a/pkgs/development/libraries/libzip/default.nix
+++ b/pkgs/development/libraries/libzip/default.nix
@@ -1,16 +1,17 @@
-args: with args;
+{stdenv, fetchurl, zlib}:
 
 stdenv.mkDerivation {
-	name = "libzip-0.8";
-	src = fetchurl {
-		url = http://www.nih.at/libzip/libzip-0.8.tar.gz;
-		sha256 = "0iy04c3b2yfwl9lpgwzm12qkdskbxj8l91r6mgn8f6ib00fj66ss";
-	};
-	configureFlags = "--enable-shared --disable-static";
-	buildInputs = [zlib];
+  name = "libzip-0.8";
+  
+  src = fetchurl {
+    url = http://www.nih.at/libzip/libzip-0.8.tar.gz;
+    sha256 = "0iy04c3b2yfwl9lpgwzm12qkdskbxj8l91r6mgn8f6ib00fj66ss";
+  };
+  
+  buildInputs = [zlib];
 
-	meta = {
-		homepage = http://www.nih.at/libzip;
-		description = "A C library for reading, creating and modifying zip archives";
-	};
+  meta = {
+    homepage = http://www.nih.at/libzip;
+    description = "A C library for reading, creating and modifying zip archives";
+  };
 }
diff --git a/pkgs/development/libraries/loudmouth/default.nix b/pkgs/development/libraries/loudmouth/default.nix
index c711e8a0ddf8..40b66c44d588 100644
--- a/pkgs/development/libraries/loudmouth/default.nix
+++ b/pkgs/development/libraries/loudmouth/default.nix
@@ -9,7 +9,6 @@ stdenv.mkDerivation {
   };
     
   propagatedBuildInputs = [gnutls libidn glib zlib];
+  
   buildInputs = [pkgconfig];
-
-  configureFlags = "--enable-shared --disable-static";
 }
diff --git a/pkgs/development/libraries/lzo/default.nix b/pkgs/development/libraries/lzo/default.nix
index 6ce1e786dbee..6f5f43af5627 100644
--- a/pkgs/development/libraries/lzo/default.nix
+++ b/pkgs/development/libraries/lzo/default.nix
@@ -8,8 +8,6 @@ stdenv.mkDerivation rec {
     sha256 = "8b1b0da8f757b9ac318e1c15a0eac8bdb56ca902a2dd25beda06c0f265f22591";
   };
   
-  configureFlags = "--enable-shared --disable-static";
-  
   meta = {
     description = "A data compresion library suitable for real-time data de-/compression";
     homepage = http://www.oberhumer.com/opensource/lzo;
diff --git a/pkgs/development/libraries/mediastreamer/2.2.0-cvs20080207.nix b/pkgs/development/libraries/mediastreamer/2.2.0-cvs20080207.nix
index 6391ce4dd6ca..0d2cefee200b 100644
--- a/pkgs/development/libraries/mediastreamer/2.2.0-cvs20080207.nix
+++ b/pkgs/development/libraries/mediastreamer/2.2.0-cvs20080207.nix
@@ -18,5 +18,5 @@ stdenv.mkDerivation rec {
 
   patches = [ ./h264.patch ./plugins.patch ];
 
-  configureFlags = "--enable-external-ortp --enable-shared --disable-static";
+  configureFlags = "--enable-external-ortp";
 }
diff --git a/pkgs/development/libraries/mpeg2dec/default.nix b/pkgs/development/libraries/mpeg2dec/default.nix
index 8b29deba56f9..684301b939dc 100644
--- a/pkgs/development/libraries/mpeg2dec/default.nix
+++ b/pkgs/development/libraries/mpeg2dec/default.nix
@@ -8,8 +8,6 @@ stdenv.mkDerivation {
     sha256 = "1vny7rg0p2rmic71hli2l2612i5yaw8vy0wsnm5nvhwfiw37cjn7";
   };
 
-  configureFlags = "--enable-shared --disable-static";
-
   meta = {
     homepage = http://libmpeg2.sourceforge.net/;
     description = "A free library for decoding mpeg-2 and mpeg-1 video streams";
diff --git a/pkgs/development/libraries/neon/0.26.nix b/pkgs/development/libraries/neon/0.26.nix
index 6c00fc9794ab..0a78d7a02a48 100644
--- a/pkgs/development/libraries/neon/0.26.nix
+++ b/pkgs/development/libraries/neon/0.26.nix
@@ -17,7 +17,6 @@ stdenv.mkDerivation {
   buildInputs = [libxml2] ++ stdenv.lib.optional compressionSupport zlib;
 
   configureFlags = ''
-    --enable-shared --disable-static
     ${if compressionSupport then "--with-zlib" else "--without-zlib"}
     ${if sslSupport then "--with-ssl --with-libs=${openssl}" else "--without-ssl"}
   '';
diff --git a/pkgs/development/libraries/openbabel/default.nix b/pkgs/development/libraries/openbabel/default.nix
index 2b994edd74c3..ca753867b5e4 100644
--- a/pkgs/development/libraries/openbabel/default.nix
+++ b/pkgs/development/libraries/openbabel/default.nix
@@ -2,13 +2,14 @@
 
 stdenv.mkDerivation {
   name = "openbabel-2.2.1";
+  
   src = fetchurl { 
     url = mirror://sf/openbabel/openbabel-2.2.1.tar.gz;
     sha256 = "822345d70778de1d2d9afe65a659f1719b8ca300066fb1fa2f473bc97c457e80";
   };
-# TODO : perl & python bindings;
-# TODO : wxGTK: I have no time to compile
-# TODO : separate lib and apps
+  
+  # TODO : perl & python bindings;
+  # TODO : wxGTK: I have no time to compile
+  # TODO : separate lib and apps
   buildInputs = [ zlib libxml2 ];
-  configureFlags = "--enable-shared --disable-static";
 }
diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix
index 4d4aefc95812..bfb2c6b998a9 100644
--- a/pkgs/development/libraries/openexr/default.nix
+++ b/pkgs/development/libraries/openexr/default.nix
@@ -11,5 +11,5 @@ stdenv.mkDerivation {
   };
   buildInputs = [pkgconfig zlib] ++ (lib.optional (args ? ctl) (args.ctl));
   propagatedBuildInputs = [pkgconfig zlib ilmbase];
-  configureFlags = "--enable-shared --disable-static --enable-imfexamples";
+  configureFlags = "--enable-imfexamples";
 }
diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix
index aec12d393a49..22f98535803c 100644
--- a/pkgs/development/libraries/openldap/default.nix
+++ b/pkgs/development/libraries/openldap/default.nix
@@ -10,8 +10,6 @@ stdenv.mkDerivation {
   
   buildInputs = [openssl cyrus_sasl db4 groff];
   
-  configureFlags = "--disable-static";
-
   dontPatchELF = 1; # !!!
 
   # Build on Glibc 2.9.
diff --git a/pkgs/development/libraries/ortp/0.7.1.nix b/pkgs/development/libraries/ortp/0.7.1.nix
deleted file mode 100644
index 7bedf39f8be1..000000000000
--- a/pkgs/development/libraries/ortp/0.7.1.nix
+++ /dev/null
@@ -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;
-  };
-}
diff --git a/pkgs/development/libraries/ortp/0.13.1.nix b/pkgs/development/libraries/ortp/default.nix
similarity index 60%
rename from pkgs/development/libraries/ortp/0.13.1.nix
rename to pkgs/development/libraries/ortp/default.nix
index ea1cd64b3d27..67d93152c2b9 100644
--- a/pkgs/development/libraries/ortp/0.13.1.nix
+++ b/pkgs/development/libraries/ortp/default.nix
@@ -1,16 +1,15 @@
-args: with args;
+{stdenv, fetchurl}:
+
 stdenv.mkDerivation rec {
-  name = "ortp-" + version;
+  name = "ortp-0.13.1";
 
   src = fetchurl {
     url = "mirror://savannah/linphone/ortp/sources/${name}.tar.gz";
     sha256 = "0k2963v4b15xnf4cpkpgjhsb8ckxpf6vdr8dnw7z3mzilji7391b";
   };
 
-  configureFlags = "--enable-shared --disable-static";
-
   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;
   };
 }
diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix
index e23b493a976f..3d3385c83f83 100644
--- a/pkgs/development/libraries/pcre/default.nix
+++ b/pkgs/development/libraries/pcre/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   };
   
   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 ""}
   '';
 
diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index 6e3d649fc202..f0e4ef83d95c 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -15,9 +15,11 @@ stdenv.mkDerivation rec {
   buildInputs = [pkgconfig zlib glib cairo freetype fontconfig libjpeg gtk]
     ++ (if qt4Support then [qt4] else []);
 
-  configureFlags = "--enable-shared --disable-static --enable-exceptions
-    --enable-cairo --enable-splash --enable-poppler-glib --enable-zlib
-    --enable-xpdf-headers "
+  configureFlags =
+    ''
+      --enable-exceptions --enable-cairo --enable-splash
+      --enable-poppler-glib --enable-zlib --enable-xpdf-headers
+    ''
     + (if qt4Support then "--enable-qt-poppler" else "--disable-qt-poppler");
 
   patches = [ ./GDir-const.patch ./use_exceptions.patch ];
diff --git a/pkgs/development/libraries/readline/readline5.nix b/pkgs/development/libraries/readline/readline5.nix
index 96ec1ffea798..a36d7870cc21 100644
--- a/pkgs/development/libraries/readline/readline5.nix
+++ b/pkgs/development/libraries/readline/readline5.nix
@@ -7,6 +7,5 @@ stdenv.mkDerivation {
     sha256 = "0icz4hqqq8mlkwrpczyaha94kns0am9z0mh3a2913kg2msb8vs0j";
   };
   propagatedBuildInputs = [ncurses];
-  configureFlags = "--enable-shared --disable-static";
   patches = stdenv.lib.optional stdenv.isDarwin ./shobj-darwin.patch;
 }
diff --git a/pkgs/development/libraries/readline/readline6.nix b/pkgs/development/libraries/readline/readline6.nix
index eb55f8db8783..fcf89207da3c 100644
--- a/pkgs/development/libraries/readline/readline6.nix
+++ b/pkgs/development/libraries/readline/readline6.nix
@@ -9,8 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   propagatedBuildInputs = [ncurses];
-  configureFlags = "--enable-shared --disable-static";
-
+  
   meta = {
     description = "GNU Readline, a library for interactive line editing";
 
diff --git a/pkgs/development/libraries/redland/default.nix b/pkgs/development/libraries/redland/default.nix
index 0a73080a937f..94e8a98f7c02 100644
--- a/pkgs/development/libraries/redland/default.nix
+++ b/pkgs/development/libraries/redland/default.nix
@@ -1,5 +1,5 @@
-args:
-with args;
+args: with args;
+
 stdenv.mkDerivation rec {
   name = "redland-1.0.7";
 
@@ -7,9 +7,14 @@ stdenv.mkDerivation rec {
     url = "mirror://sf/librdf/${name}.tar.gz";
     sha256 = "1z160hhrnlyy5c8vh2hjza6kdfmzml8mg9dk8yffifkhnxjq5r2z";
   };
+  
   buildInputs = [pkgconfig];
-  propagatedBuildInputs = [ bdb openssl libxslt perl mysql postgresql sqlite
-    curl pcre libxml2];
-  configureFlags = "--disable-static --with-threads --with-bdb=${bdb}";
-  patchPhase="sed -e 1s@/usr@${perl}@ -i utils/touch-mtime.pl";
+  
+  propagatedBuildInputs = [
+    bdb openssl libxslt perl mysql postgresql sqlite curl pcre libxml2
+  ];
+    
+  configureFlags = "--with-threads --with-bdb=${bdb}";
+  
+  patchPhase = "sed -e 1s@/usr@${perl}@ -i utils/touch-mtime.pl";
 }
diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index 623d38b18526..86d2a627212a 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   buildInputs = [readline];
 
   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
   '';
 
diff --git a/pkgs/development/libraries/telepathy-gabble/default.nix b/pkgs/development/libraries/telepathy-gabble/default.nix
index 44affecefd88..67ffa950c956 100644
--- a/pkgs/development/libraries/telepathy-gabble/default.nix
+++ b/pkgs/development/libraries/telepathy-gabble/default.nix
@@ -1,17 +1,18 @@
 args: with args;
+
 stdenv.mkDerivation rec {
-	name = "telepathy-gabble-0.7.2";
+  name = "telepathy-gabble-0.7.2";
 
-	src = fetchurl {
-		url = "${meta.homepage}/releases/telepathy-gabble/${name}.tar.gz";
-		sha256 = "0r1j475a5s2a4f10hybmavf4kf6nrnjnv091dpic5nl2asdilb7i";
-	};
+  src = fetchurl {
+    url = "${meta.homepage}/releases/telepathy-gabble/${name}.tar.gz";
+    sha256 = "0r1j475a5s2a4f10hybmavf4kf6nrnjnv091dpic5nl2asdilb7i";
+  };
 
-	propagatedBuildInputs = [telepathy_glib loudmouth];
-	buildInputs = [pkgconfig libxslt];
-	configureFlags = "--enable-shared --disable-static";
-
-	meta = {
-		homepage = http://telepathy.freedesktop.org;
-	};
+  propagatedBuildInputs = [telepathy_glib loudmouth];
+  
+  buildInputs = [pkgconfig libxslt];
+  
+  meta = {
+    homepage = http://telepathy.freedesktop.org;
+  };
 }
diff --git a/pkgs/development/libraries/telepathy-glib/default.nix b/pkgs/development/libraries/telepathy-glib/default.nix
index fd4f59bdc8a2..764854045683 100644
--- a/pkgs/development/libraries/telepathy-glib/default.nix
+++ b/pkgs/development/libraries/telepathy-glib/default.nix
@@ -1,17 +1,18 @@
 args: with args;
+
 stdenv.mkDerivation rec {
-	name = "telepathy-glib-0.7.0";
+  name = "telepathy-glib-0.7.0";
 
-	src = fetchurl {
-		url = "${meta.homepage}/releases/telepathy-glib/${name}.tar.gz";
-		sha256 = "0hf1jrgisr7skrji7djh66q0ic351vlsm65xqy982p5d0axzxkz5";
-	};
+  src = fetchurl {
+    url = "${meta.homepage}/releases/telepathy-glib/${name}.tar.gz";
+    sha256 = "0hf1jrgisr7skrji7djh66q0ic351vlsm65xqy982p5d0axzxkz5";
+  };
 
-	propagatedBuildInputs = [dbus_glib glib python];
-	buildInputs = [pkgconfig libxslt];
-	configureFlags = "--enable-shared --disable-static";
-
-	meta = {
-		homepage = http://telepathy.freedesktop.org;
-	};
+  propagatedBuildInputs = [dbus_glib glib python];
+  
+  buildInputs = [pkgconfig libxslt];
+  
+  meta = {
+    homepage = http://telepathy.freedesktop.org;
+  };
 }
diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index 6f9aa8530b6b..0e2f22b9a295 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -34,10 +34,9 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional x11Support x11
     ++ stdenv.lib.optional cupsSupport cups;
 
-  configureFlags = "
-    --disable-static
+  configureFlags = ''
     ${if x11Support then "--with-x" else "--without-x"}
-  ";
+  '';
 
   NIX_CFLAGS_COMPILE = "-fpic";
 
diff --git a/pkgs/misc/ntfs-3g/default.nix b/pkgs/misc/ntfs-3g/default.nix
index 5fedd9a73866..511a4e1eadf4 100644
--- a/pkgs/misc/ntfs-3g/default.nix
+++ b/pkgs/misc/ntfs-3g/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
       --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 = {
     homepage = http://www.ntfs-3g.org;
diff --git a/pkgs/os-specific/linux/libsmbios/default.nix b/pkgs/os-specific/linux/libsmbios/default.nix
index 2cdeed3ac49c..567463cf3fb8 100644
--- a/pkgs/os-specific/linux/libsmbios/default.nix
+++ b/pkgs/os-specific/linux/libsmbios/default.nix
@@ -10,8 +10,6 @@ stdenv.mkDerivation rec {
   
   buildInputs = [libxml2];
   
-  configureFlags = "--disable-static"; # bloated enough as it is...
-
   meta = {
     homepage = http://linux.dell.com/libsmbios/main/index.html;
     description = "A library to obtain BIOS information";
diff --git a/pkgs/os-specific/linux/pam_console/default.nix b/pkgs/os-specific/linux/pam_console/default.nix
index 56c881b33407..fbdcce2d1b13 100644
--- a/pkgs/os-specific/linux/pam_console/default.nix
+++ b/pkgs/os-specific/linux/pam_console/default.nix
@@ -20,8 +20,6 @@ stdenv.mkDerivation {
 
   makeFlags = "LEX=flex";
 
-  configureFlags = "--disable-static";
-
   preConfigure = "
     cd pam_console
     cp ${configure} configure.ac
diff --git a/pkgs/servers/sql/mysql5/default.nix b/pkgs/servers/sql/mysql5/default.nix
index 3bd0da493793..812412f37963 100644
--- a/pkgs/servers/sql/mysql5/default.nix
+++ b/pkgs/servers/sql/mysql5/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   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 "");
 
   NIX_CFLAGS_COMPILE = if stdenv.system == "x86_64-linux" then "-fPIC" else "";
diff --git a/pkgs/servers/x11/xorg/builder.sh b/pkgs/servers/x11/xorg/builder.sh
index 8bde2867e10e..7da1da77340d 100644
--- a/pkgs/servers/x11/xorg/builder.sh
+++ b/pkgs/servers/x11/xorg/builder.sh
@@ -1,11 +1,10 @@
-# This is the builder for all X11R7 components.
+# This is the builder for all X.org components.
 source $stdenv/setup
 
 
 # After installation, automatically add all "Requires" fields in the
 # pkgconfig files (*.pc) to the propagated build inputs.
 origPostInstall=$postInstall
-postInstall=postInstall
 postInstall() {
     if test -n "$origPostInstall"; then eval "$origPostInstall"; fi
 
@@ -17,7 +16,6 @@ postInstall() {
 
     for r in $requires; do
         for p in $pkgs; do
-#            echo $r $p
             if test -e $p/lib/pkgconfig/$r.pc; then
                 echo "  found requisite $r in $p"
                 propagatedBuildInputs="$propagatedBuildInputs $p"
@@ -30,9 +28,6 @@ postInstall() {
 }
 
 
-configureFlags="--disable-static $configureFlags"
-
-
 installFlags="appdefaultdir=$out/share/X11/app-defaults"
 
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d6bdfa45986a..007482688caa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3013,7 +3013,7 @@ let
     use_svn = stdenv.system == "x86_64-linux";
   };
 
-  gettext = composedArgsAndFun (selectVersion ../development/libraries/gettext "0.17") {
+  gettext = import ../development/libraries/gettext {
     inherit fetchurl stdenv;
   };
 
@@ -3286,7 +3286,7 @@ let
     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;
   };
 
@@ -3491,8 +3491,7 @@ let
     inherit fetchurl stdenv;
   };
 
-  liboil = composedArgsAndFun
-    (selectVersion ../development/libraries/liboil "0.3.15") {
+  liboil = import ../development/libraries/liboil {
     inherit fetchurl stdenv pkgconfig;
     inherit (gtkLibs) glib;
   };
@@ -3523,7 +3522,7 @@ let
     inherit fetchurl stdenv pkgconfig;
   };
 
-  libsigsegv = selectVersion ../development/libraries/libsigsegv "2.5" {
+  libsigsegv = import ../development/libraries/libsigsegv/2.5.nix {
     inherit fetchurl stdenv;
   };
 
@@ -3593,7 +3592,7 @@ let
     inherit fetchurl stdenv;
   };
 
-  libxklavier = selectVersion ../development/libraries/libxklavier "3.4" {
+  libxklavier = import ../development/libraries/libxklavier {
     inherit fetchurl stdenv xkeyboard_config pkgconfig libxml2;
     inherit (xorg) libX11 libICE libxkbfile;
     inherit (gtkLibs) glib;
@@ -3755,7 +3754,7 @@ let
     inherit stdenv perl;
   };
 
-  ortp = selectVersion ../development/libraries/ortp "0.13.1" {
+  ortp = import ../development/libraries/ortp {
     inherit fetchurl stdenv;
   };