From 130b060d907ce3883838a900e44845c36722a07d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 11 Aug 2009 22:23:30 +0000
Subject: [PATCH] * GNU parted: e2fsprogs -> libuuid.

svn path=/nixpkgs/trunk/; revision=16694
---
 pkgs/tools/misc/parted/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix    | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix
index 37e91491faae..8fd5c196c58e 100644
--- a/pkgs/tools/misc/parted/default.nix
+++ b/pkgs/tools/misc/parted/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, devicemapper, e2fsprogs, gettext, readline }:
+{ stdenv, fetchurl, devicemapper, libuuid, gettext, readline }:
 
 stdenv.mkDerivation rec {
   name = "parted-1.9.0";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "02amqpzl8lgk247cjsbaz1nsiz9i1pbj0adx0z109h94p90i48sk";
   };
 
-  buildInputs = [ devicemapper e2fsprogs gettext readline ];
+  buildInputs = [ devicemapper libuuid gettext readline ];
 
   # XXX: For some reason our libreadline.so doesn't have libncurses as
   # NEEDED and `configure' links with `-Wl,--as-needed' so when
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e45fb2f75719..fc52a30ab05f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1129,7 +1129,7 @@ let
   };
 
   parted = import ../tools/misc/parted {
-    inherit fetchurl stdenv devicemapper e2fsprogs gettext readline;
+    inherit fetchurl stdenv devicemapper libuuid gettext readline;
   };
 
   patch = gnupatch;
@@ -3980,11 +3980,12 @@ let
     inherit fetchurl stdenv liboil pkgconfig;
   };
 
-  SDL = import ../development/libraries/SDL {
+  SDL = makeOverridable (import ../development/libraries/SDL) {
     inherit fetchurl stdenv pkgconfig x11 mesa alsaLib pulseaudio;
     inherit (xlibs) libXrandr;
     openglSupport = mesaSupported;
     alsaSupport = true;
+    pulseaudioSupport = false; # better go through ALSA
   };
 
   SDL_image = import ../development/libraries/SDL_image {
@@ -4761,8 +4762,8 @@ let
 
   hal = import ../os-specific/linux/hal {
     inherit fetchurl stdenv pkgconfig python pciutils usbutils expat
-      libusb dbus dbus_glib libuuid perl perlXMLParser                                     
-      gettext zlib eject libsmbios udev gperf dmidecode;                                   
+      libusb dbus dbus_glib libuuid perl perlXMLParser
+      gettext zlib eject libsmbios udev gperf dmidecode;
     inherit (gtkLibs) glib;
   };