* Don't pass Blackdown to firefox-wrapper unless it is actually built.
svn path=/nixpkgs/branches/usability/; revision=4999
This commit is contained in:
parent
a2d161eb4c
commit
4c63a4a97a
@ -6,4 +6,4 @@ if stdenv.system == "i686-linux"
|
|||||||
inherit stdenv fetchurl;
|
inherit stdenv fetchurl;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
false
|
null
|
||||||
|
@ -1887,9 +1887,8 @@ rec {
|
|||||||
plugins = [
|
plugins = [
|
||||||
MPlayerPlugin
|
MPlayerPlugin
|
||||||
flashplayer
|
flashplayer
|
||||||
blackdown
|
|
||||||
# RealPlayer # disabled by default for legal reasons
|
# RealPlayer # disabled by default for legal reasons
|
||||||
];
|
] ++ (if blackdown != null then [blackdown] else []);
|
||||||
};
|
};
|
||||||
|
|
||||||
firefoxWrapper = wrapFirefox firefox;
|
firefoxWrapper = wrapFirefox firefox;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user