Merging from trunk. I had to give away some structure to build the native

sheevaplug kernel, so the kernel does not build in the sheevaplug right now.
I will try to fix that in next commits.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19045

3 files changed, 68 insertions, 12 deletions

diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index 5f770c9cf7c9..5e0440d9c9ff 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, pkgconfig, gnum4, gdbm, libtool, glib, dbus, hal, avahi
-, gconf, liboil, libX11, libICE, libSM, intltool, gettext, alsaLib
-, libsamplerate, libsndfile, speex, ... }:
+, gconf, liboil, gtk, libX11, libICE, libSM, libXtst, libXi, intltool, gettext
+, libcap, alsaLib, libsamplerate, libsndfile, speex }:
 
 stdenv.mkDerivation rec {
-  name = "pulseaudio-0.9.13";
+  name = "pulseaudio-0.9.21";
 
   src = fetchurl {
     url = "http://0pointer.de/lennart/projects/pulseaudio/${name}.tar.gz";
-    sha256 = "0lwd5rcppyvcvy9n2j074k5mydgqszfvw6fnsjlz46gkda9vgydq";
+    sha256 = "0m72rrbgy9qncwhqsq9q35niicy6i06sk3g5i8w9bvkhmib27qll";
   };
 
   # Since `libpulse*.la' contain `-lgdbm', it must be propagated.
@@ -15,25 +15,24 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig gnum4 libtool glib dbus hal avahi gconf liboil
-    libsamplerate libsndfile speex alsaLib
-    libX11 libICE libSM
+    libsamplerate libsndfile speex alsaLib libcap
+    gtk libX11 libICE libSM libXtst libXi
     intltool gettext
   ];
 
   preConfigure = ''
-    # Disable the ConsoleKit module since we don't currently have that
-    # on NixOS.
-    sed -i "src/daemon/default.pa.in" \
-        -e 's/^\( *load-module \+module-console-kit\)/# \1/g'
-
     # Change the `padsp' script so that it contains the full path to
     # `libpulsedsp.so'.
     sed -i "src/utils/padsp" \
         -e "s|libpulsedsp\.so|$out/lib/libpulsedsp.so|g"
+
+    # Move the udev rules under $(prefix).
+    sed -i "src/Makefile.in" \
+        -e "s|udevrulesdir[[:blank:]]*=.*$|udevrulesdir = $out/lib/udev/rules.d|g"
   '';
 
   configureFlags = ''
-    --disable-solaris --disable-jack --disable-bluez --disable-polkit --with-x --enable-asyncdns --localstatedir=/var
+    --disable-solaris --disable-udev --disable-jack --disable-bluez --localstatedir=/var
   '';
 
   meta = {
@@ -54,5 +53,8 @@ stdenv.mkDerivation rec {
     # Note: Practically, the server is under the GPL due to the
     # dependency on `libsamplerate'.  See `LICENSE' for details.
     licenses = "LGPLv2+";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+    platforms = stdenv.lib.platforms.gnu;
   };
 }
diff --git a/pkgs/servers/sql/mysql51/abi_check.patch b/pkgs/servers/sql/mysql51/abi_check.patch
new file mode 100644
index 000000000000..e9f9cfdc9d95
--- /dev/null
+++ b/pkgs/servers/sql/mysql51/abi_check.patch
@@ -0,0 +1,20 @@
+diff -rc mysql-5.1.40/Makefile.in mysql-5.1.40-new/Makefile.in
+*** mysql-5.1.40/Makefile.in	2009-10-06 19:57:22.000000000 +0200
+--- mysql-5.1.40-new/Makefile.in	2009-12-16 13:07:16.060108763 +0100
+***************
+*** 891,897 ****
+  		--srcdir=$(top_srcdir)
+  	storage/myisam/myisamchk --silent --fast $(distdir)/win/data/mysql/*.MYI
+  
+! all-local:		@ABI_CHECK@	
+  
+  tags:
+  	support-files/build-tags
+--- 891,897 ----
+  		--srcdir=$(top_srcdir)
+  	storage/myisam/myisamchk --silent --fast $(distdir)/win/data/mysql/*.MYI
+  
+! all-local:		
+  
+  tags:
+  	support-files/build-tags
diff --git a/pkgs/servers/sql/mysql51/default.nix b/pkgs/servers/sql/mysql51/default.nix
new file mode 100644
index 000000000000..64ffac0439b1
--- /dev/null
+++ b/pkgs/servers/sql/mysql51/default.nix
@@ -0,0 +1,34 @@
+{stdenv, fetchurl, ps, ncurses, zlib, perl, openssl}:
+
+# Note: zlib is not required; MySQL can use an internal zlib.
+
+stdenv.mkDerivation {
+  name = "mysql-5.1.41";
+
+  src = fetchurl {
+    url = ftp://mirror.leaseweb.com/mysql/Downloads/MySQL-5.1/mysql-5.1.41.tar.gz;
+    sha256 = "05mwinpq35iaglylw5n772vv2p1kxyni6f2hv081gxm58gdj3dsw";
+  };
+
+  buildInputs = [ps ncurses zlib perl openssl];
+
+  configureFlags = "--enable-thread-safe-client --with-ssl=${openssl} --with-embedded-server --with-plugins=max-no-ndb" +
+    (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_CXXFLAGS = if stdenv.system == "x86_64-linux" then "-fPIC" else "";
+  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
+
+  patches = [./abi_check.patch];
+
+  postInstall =
+    ''
+      ln -s mysqld_safe $out/bin/mysqld
+      rm -rf $out/mysql-test $out/sql-bench $out/share/info
+    '';
+
+  meta = {
+    homepage = http://www.mysql.com/;
+    description = "The world's most popular open source database";
+  };
+}