From edbbddce1da7928f44bceaa7cda5aaf369e09e5d Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 6 Oct 2009 05:43:51 +0000
Subject: A case study in transitive overrides. WebKit needs fresh glib. This
 means it needs a whole slice of system built against glib-2.22.. Added
 overrides are generic enough, though. So the same way can be used to override
 everything. I have failed (so far?) to add mkOverridable into stdenv, though.

svn path=/nixpkgs/trunk/; revision=17661
---
 pkgs/development/libraries/gstreamer/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'pkgs/development/libraries/gstreamer/default.nix')

diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix
index a765510e7c0..2170bcd845b 100644
--- a/pkgs/development/libraries/gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/default.nix
@@ -1,29 +1,29 @@
 args: with args;
 rec {
-  gstreamer = import ./gstreamer {
+  gstreamer = makeOverridable (import ./gstreamer) {
     inherit (args) fetchurl stdenv perl bison flex
        pkgconfig python which gtkdoc glib libxml2;
   };
 
-  gstPluginsBase = import ./gst-plugins-base {
+  gstPluginsBase = makeOverridable (import ./gst-plugins-base) {
     inherit gstreamer;
     inherit (args) fetchurl stdenv pkgconfig python
       libX11 libXv libXext alsaLib cdparanoia libogg libtheora
       libvorbis freetype pango liboil gtk which gtkdoc;
   };
 
-  gstPluginsGood = import ./gst-plugins-good {
+  gstPluginsGood = makeOverridable (import ./gst-plugins-good) {
     inherit gstPluginsBase;
     inherit (args) fetchurl stdenv pkgconfig aalib cairo flac hal
       libjpeg zlib speex libpng libdv libcaca dbus libiec61883
       libavc1394 ladspaH taglib gdbm pulseaudio libsoup;
   };
 
-  gstFfmpeg = import ./gst-ffmpeg {
+  gstFfmpeg = makeOverridable (import ./gst-ffmpeg) {
     inherit fetchurl stdenv pkgconfig gstPluginsBase bzip2;
   };
 
-  gnonlin = import ./gnonlin {
+  gnonlin = makeOverridable (import ./gnonlin) {
     inherit fetchurl stdenv pkgconfig gstreamer gstPluginsBase;
   };
 }
-- 
cgit 1.4.1