7 files changed, 136 insertions, 100 deletions
diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix
new file mode 100644
index 000000000000..1669d083f226
--- /dev/null
+++ b/pkgs/development/libraries/allegro/default.nix
@@ -0,0 +1,59 @@
+x@{builderDefsPackage
+  , texinfo, libXext, xextproto, libX11, xproto, libXpm, libXt, libXcursor
+  , alsaLib, cmake, zlib, libpng, libvorbis, libXxf86dga, libXxf86misc
+  , xf86dgaproto, xf86miscproto, xf86vidmodeproto, libXxf86vm, openal
+  , ...}:
+builderDefsPackage
+(a :  
+let 
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+    [];
+
+  buildInputs = map (n: builtins.getAttr n x)
+    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+  sourceInfo = rec {
+    baseName="allegro";
+    version="4.4.0.1";
+    name="${baseName}-${version}";
+    project="alleg";
+    url="mirror://sourceforge/project/${project}/${baseName}/${version}/${name}.tar.gz";
+    hash="0qgkmazr07lmnbj6h6yk10vmcm15gafcwy5jn7xpwy7bahzraiz0";
+  };
+in
+rec {
+  src = a.fetchurl {
+    url = sourceInfo.url;
+    sha256 = sourceInfo.hash;
+  };
+
+  inherit (sourceInfo) name version;
+  inherit buildInputs;
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["doCmake" "doMakeInstall"];
+
+  doCmake = a.fullDepEntry (''
+    export NIX_LDFLAGS="$NIX_LDFLAGS -lXext -lX11 -lXpm -lXcursor -lXxf86vm"
+    cmake -D CMAKE_INSTALL_PREFIX=$out -D CMAKE_SKIP_RPATH=ON .
+  '') ["minInit" "doUnpack" "addInputs"];
+      
+  makeFlags = [
+  ];
+
+  meta = {
+    description = "A game programming library";
+    license = "free-noncopyleft"; # giftware
+    maintainers = with a.lib.maintainers;
+    [
+      raskin
+    ];
+    platforms = with a.lib.platforms;
+      linux;
+  };
+  passthru = {
+    updateInfo = {
+      downloadPage = "http://sourceforge.net/projects/alleg/files/";
+    };
+  };
+}) x
+
diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix
index 1c58aacfdf26..c59184007e53 100644
--- a/pkgs/development/libraries/apr-util/default.nix
+++ b/pkgs/development/libraries/apr-util/default.nix
@@ -5,11 +5,11 @@
 assert bdbSupport -> db4 != null;
 
 stdenv.mkDerivation rec {
-  name = "apr-util-1.3.9";
+  name = "apr-util-1.3.10";
   
   src = fetchurl {
     url = "mirror://apache/apr/${name}.tar.bz2";
-    sha256 = "10zcy1an5xkjx8nflirvm2a8rnp9psckws6r7xr5wq6ffxnafhc7";
+    sha256 = "1vhps080b0f9z6ibq7xqbhdrclb89min7xwvc2zzc5wf0x4w1h0s";
   };
   
   configureFlags = ''
diff --git a/pkgs/development/libraries/cgui/default.nix b/pkgs/development/libraries/cgui/default.nix
new file mode 100644
index 000000000000..6bd3dd41de74
--- /dev/null
+++ b/pkgs/development/libraries/cgui/default.nix
@@ -0,0 +1,57 @@
+x@{builderDefsPackage
+  , texinfo, allegro, perl
+  , ...}:
+builderDefsPackage
+(a :  
+let 
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+    [];
+
+  buildInputs = map (n: builtins.getAttr n x)
+    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+  sourceInfo = rec {
+    baseName="cgui";
+    version="2.0.3";
+    name="${baseName}-${version}";
+    project="${baseName}";
+    url="mirror://sourceforge/project/${project}/${version}/${name}.tar.gz";
+    hash="00kk4xaw68m44awy8zq4g5plx372swwccvzshn68a0a8f3f2wi4x";
+  };
+in
+rec {
+  src = a.fetchurl {
+    url = sourceInfo.url;
+    sha256 = sourceInfo.hash;
+  };
+
+  inherit (sourceInfo) name version;
+  inherit buildInputs;
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["genMakefile" "doMakeInstall"];
+
+  genMakefile = a.fullDepEntry (''
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC"
+    sh fix.sh unix
+  '') ["minInit" "doUnpack" "addInputs"];
+      
+  makeFlags = [
+    "SYSTEM_DIR=$out"
+  ];
+
+  meta = {
+    description = "A multiplatform basic GUI library";
+    maintainers = with a.lib.maintainers;
+    [
+      raskin
+    ];
+    platforms = with a.lib.platforms;
+      linux;
+  };
+  passthru = {
+    updateInfo = {
+      downloadPage = "http://sourceforge.net/projects/cgui/files/";
+    };
+  };
+}) x
+
diff --git a/pkgs/development/libraries/qt-4.x/4.5/default.nix b/pkgs/development/libraries/qt-4.x/4.5/default.nix
deleted file mode 100644
index 3b29043aeeb4..000000000000
--- a/pkgs/development/libraries/qt-4.x/4.5/default.nix
+++ /dev/null
@@ -1,86 +0,0 @@
-{ stdenv, fetchurl
-, libXft, libXrender, randrproto, xextproto, libXinerama, xineramaproto, libXcursor, libXmu
-, libXext, libXfixes, inputproto, fixesproto, libXrandr, freetype, fontconfig
-, zlib, libjpeg, mysql, libpng, which, mesa, openssl, dbus, cups, pkgconfig, libtiff, glib
-, buildDemos ? false, buildExamples ? false, keepDocumentation ? false}:
-
-stdenv.mkDerivation {
-  name = "qt-4.5.3";
-  
-  src = fetchurl {
-    url = ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.5.3.tar.gz;
-    sha256 = "19ls11m5skcjfgrfcidwqdm72kl7qrbj4hdl1nbmcdaxh91gr1qc";
-  };
-  
-  setupHook = ./setup-hook.sh;
-  
-  propagatedBuildInputs = [
-    libXft 
-    libXrender 
-    libXrandr 
-    randrproto 
-    xextproto
-    libXinerama 
-    xineramaproto 
-    libXcursor 
-    zlib 
-    libjpeg 
-    mysql 
-    libpng 
-    which 
-    mesa
-    libXmu 
-    openssl 
-    dbus.libs 
-    cups 
-    pkgconfig 
-    libXext 
-    freetype 
-    fontconfig 
-    inputproto
-    fixesproto 
-    libXfixes 
-    glib 
-    libtiff
-  ];
-  
-  # libQtNetwork will call libQtCore for it to dlopen openssl.
-  NIX_LDFLAGS = "-rpath ${openssl}/lib";
-  # Don't shrink the rpath, to keep ${openssl} in it.
-  dontPatchELF = 1;
-
-  prefixKey = "-prefix ";
-
-  configureFlags = ''
-    -v -no-separate-debug-info -release
-    -system-zlib -system-libpng -system-libjpeg -fast
-    -qt-gif -confirm-license -opensource
-    -opengl -xrender -xrandr -xinerama -xcursor -qt-sql-mysql
-    -qdbus -cups -glib -xfixes -dbus-linked
-    -fontconfig -I${freetype}/include/freetype2
-    ${if buildDemos == true then "" else "-nomake demos"}
-    ${if buildExamples == true then "" else "-nomake examples"}
-  '';
-    
-  patchPhase = ''
-    substituteInPlace configure --replace /bin/pwd pwd
-    sed -e 's@/usr@/FOO@' -i config.tests/*/*.test -i mkspecs/*/*.conf
-  '';
-
-  # Remove the documentation: it takes up >= 130 MB, which is more
-  # than half of the installed size.  Ideally we should put this in a
-  # separate package (as well as the Qt Designer).
-  postInstall = ''
-    ${if keepDocumentation == false then "rm -rf $out/doc" else ""}
-  '';
-
-  enableParallelBuilding = true;
-
-  meta = {
-    homepage = http://www.qtsoftware.com/downloads/opensource/appdev/linux-x11-cpp;
-    description = "A cross-platform application framework for C++";
-    license = "GPL/LGPL";
-    maintainers = [ stdenv.lib.maintainers.sander ];
-    platforms = stdenv.lib.platforms.mesaPlatforms;
-  };
-}
diff --git a/pkgs/development/libraries/qt-4.x/4.5/setup-hook.sh b/pkgs/development/libraries/qt-4.x/4.5/setup-hook.sh
deleted file mode 100644
index f9ecacbbb7df..000000000000
--- a/pkgs/development/libraries/qt-4.x/4.5/setup-hook.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-export QTDIR=@out@
-
-if [ -n "$includeAllQtDirs" ]; then
-  # This helps for g++, but not for moc. And no qt4 package should expect
-  # having all qt4 header files dirs into -I.
-  for d in @out@/include/*; do
-      export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$d"
-  done
-fi
diff --git a/pkgs/development/libraries/rlog/default.nix b/pkgs/development/libraries/rlog/default.nix
new file mode 100644
index 000000000000..aae678688848
--- /dev/null
+++ b/pkgs/development/libraries/rlog/default.nix
@@ -0,0 +1,15 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
+  name = "rlog-1.4";
+
+  src = fetchurl {
+    url = "http://rlog.googlecode.com/files/rlog-1.4.tar.gz";
+    sha256 = "0y9zg0pd7vmnskwac1qdyzl282z7kb01nmn57lsg2mjdxgnywf59";
+  };
+
+  meta = {
+    homepage = http://www.arg0.net/rlog;
+    description = "A C++ logging library used in encfs";
+  };
+}
diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index 015c449cd037..2a53f4b09bd2 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -3,11 +3,11 @@
 assert readline != null -> ncurses != null;
 
 stdenv.mkDerivation {
-  name = "sqlite-3.7.2";
+  name = "sqlite-3.7.4";
 
   src = fetchurl {
-    url = "http://www.sqlite.org/sqlite-amalgamation-3.7.2.tar.gz";
-    sha256 = "12i50bypcq7havphrilzi0hnwgv01drxsc36kyby76hpk417zsvl";
+    url = http://www.sqlite.org/sqlite-autoconf-3070400.tar.gz;
+    sha256 = "131lwjqh1nfyrx4vjya2wdl6bnc0gzvcrg0wf06sz2iisj0h9vsl";
   };
 
   buildInputs = [ readline ncurses ];