diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-03-08 16:03:47 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-03-08 16:03:47 +0000 |
| commit | 4c63a4a97a56d992ccc83e77ce477d3b22906240 (patch) | |
| tree | 0b625aa4df0ba2d3f46a8c2a3ecae8ef15bf786f | |
| parent | a2d161eb4c152cc48c85372325cd6ceece492f14 (diff) | |
* Don't pass Blackdown to firefox-wrapper unless it is actually built.
svn path=/nixpkgs/branches/usability/; revision=4999
| -rw-r--r-- | pkgs/development/compilers/blackdown/default.nix | 2 | ||||
| -rw-r--r-- | 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; |