From 4c63a4a97a56d992ccc83e77ce477d3b22906240 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 8 Mar 2006 16:03:47 +0000
Subject: * Don't pass Blackdown to firefox-wrapper unless it is actually
 built.

svn path=/nixpkgs/branches/usability/; revision=4999
---
 pkgs/development/compilers/blackdown/default.nix | 2 +-
 pkgs/top-level/all-packages.nix                  | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/blackdown/default.nix b/pkgs/development/compilers/blackdown/default.nix
index 43ed19a109868..b83c3124e8a0a 100644
--- a/pkgs/development/compilers/blackdown/default.nix
+++ b/pkgs/development/compilers/blackdown/default.nix
@@ -6,4 +6,4 @@ if stdenv.system == "i686-linux"
       inherit stdenv fetchurl;
     }
   else
-    false
+    null
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c720f94257f20..4d95325c1e046 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1887,9 +1887,8 @@ rec {
     plugins = [
       MPlayerPlugin
       flashplayer
-      blackdown
 #      RealPlayer  # disabled by default for legal reasons
-    ];
+    ] ++ (if blackdown != null then [blackdown] else []);
   };
 
   firefoxWrapper = wrapFirefox firefox;
-- 
cgit 1.4.1